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
|
||
|---|---|---|
| .. | ||
| b43.h | ||
| debugfs.c | ||
| debugfs.h | ||
| dma.c | ||
| dma.h | ||
| Kconfig | ||
| leds.c | ||
| leds.h | ||
| lo.c | ||
| lo.h | ||
| main.c | ||
| main.h | ||
| Makefile | ||
| pcmcia.c | ||
| pcmcia.h | ||
| phy_a.c | ||
| phy_a.h | ||
| phy_common.c | ||
| phy_common.h | ||
| phy_g.c | ||
| phy_g.h | ||
| phy_lp.c | ||
| phy_lp.h | ||
| phy_n.c | ||
| phy_n.h | ||
| pio.c | ||
| pio.h | ||
| rfkill.c | ||
| rfkill.h | ||
| sdio.c | ||
| sdio.h | ||
| sysfs.c | ||
| sysfs.h | ||
| tables.c | ||
| tables.h | ||
| tables_lpphy.c | ||
| tables_lpphy.h | ||
| tables_nphy.c | ||
| tables_nphy.h | ||
| wa.c | ||
| wa.h | ||
| xmit.c | ||
| xmit.h | ||