Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits) net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n ipv6: skb_dst() can be NULL in ipv6_hop_jumbo(). tg3: Update copyright and driver version tg3: Disable 5717 serdes and B0 support tg3: Add reliable serdes detection for 5717 A0 tg3: Fix std rx prod ring handling tg3: Fix std prod ring nicaddr for 5787 and 57765 sfc: Fix conditions for MDIO self-test sfc: Fix polling for slow MCDI operations e1000e: workaround link issues on busy hub in half duplex on 82577/82578 e1000e: MDIO slow mode should always be done for 82577 ixgbe: update copyright dates ixgbe: Do not attempt to perform interrupts in netpoll when down cfg80211: fix refcount imbalance when wext is disabled mac80211: fix queue selection for data frames on monitor interfaces iwlwifi: silence buffer overflow warning iwlwifi: disable tx on beacon update notification iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr mac80211: fix endian error mac80211: add missing sanity checks for action frames ...
Showing
- drivers/net/e1000e/e1000.h 0 additions, 1 deletiondrivers/net/e1000e/e1000.h
- drivers/net/e1000e/ich8lan.c 71 additions, 5 deletionsdrivers/net/e1000e/ich8lan.c
- drivers/net/e1000e/phy.c 0 additions, 85 deletionsdrivers/net/e1000e/phy.c
- drivers/net/ixgbe/Makefile 1 addition, 1 deletiondrivers/net/ixgbe/Makefile
- drivers/net/ixgbe/ixgbe.h 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe.h
- drivers/net/ixgbe/ixgbe_82598.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_82598.c
- drivers/net/ixgbe/ixgbe_82599.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_82599.c
- drivers/net/ixgbe/ixgbe_common.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_common.c
- drivers/net/ixgbe/ixgbe_common.h 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_common.h
- drivers/net/ixgbe/ixgbe_dcb.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb.c
- drivers/net/ixgbe/ixgbe_dcb.h 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb.h
- drivers/net/ixgbe/ixgbe_dcb_82598.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb_82598.c
- drivers/net/ixgbe/ixgbe_dcb_82598.h 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb_82598.h
- drivers/net/ixgbe/ixgbe_dcb_82599.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb_82599.c
- drivers/net/ixgbe/ixgbe_dcb_82599.h 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb_82599.h
- drivers/net/ixgbe/ixgbe_dcb_nl.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_dcb_nl.c
- drivers/net/ixgbe/ixgbe_ethtool.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_ethtool.c
- drivers/net/ixgbe/ixgbe_fcoe.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_fcoe.c
- drivers/net/ixgbe/ixgbe_fcoe.h 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_fcoe.h
- drivers/net/ixgbe/ixgbe_main.c 6 additions, 2 deletionsdrivers/net/ixgbe/ixgbe_main.c
Please register or sign in to comment