mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 11:21:33 +00:00
f8965467f3
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add support for active DA cables
ixgbe: dcb, do not tag tc_prio_control frames
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: always enable vlan strip/insert when DCB is enabled
ixgbe: remove some redundant code in setting FCoE FIP filter
ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
ixgbe: fix header len when unsplit packet overflows to data buffer
ipv6: Never schedule DAD timer on dead address
ipv6: Use POSTDAD state
ipv6: Use state_lock to protect ifa state
ipv6: Replace inet6_ifaddr->dead with state
cxgb4: notify upper drivers if the device is already up when they load
cxgb4: keep interrupts available when the ports are brought down
cxgb4: fix initial addition of MAC address
cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
cnic: Convert cnic_local_flags to atomic ops.
can: Fix SJA1000 command register writes on SMP systems
bridge: fix build for CONFIG_SYSFS disabled
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
...
Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).
Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
|
||
|---|---|---|
| .. | ||
| hostap_80211_rx.c | ||
| hostap_80211_tx.c | ||
| hostap_80211.h | ||
| hostap_ap.c | ||
| hostap_ap.h | ||
| hostap_common.h | ||
| hostap_config.h | ||
| hostap_cs.c | ||
| hostap_download.c | ||
| hostap_hw.c | ||
| hostap_info.c | ||
| hostap_ioctl.c | ||
| hostap_main.c | ||
| hostap_pci.c | ||
| hostap_plx.c | ||
| hostap_proc.c | ||
| hostap_wlan.h | ||
| hostap.h | ||
| Kconfig | ||
| Makefile | ||