Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000e/netdev.c
Showing
- drivers/net/benet/be_cmds.c 5 additions, 0 deletionsdrivers/net/benet/be_cmds.c
- drivers/net/bnx2x/bnx2x_main.c 23 additions, 9 deletionsdrivers/net/bnx2x/bnx2x_main.c
- drivers/net/can/pch_can.c 3 additions, 2 deletionsdrivers/net/can/pch_can.c
- drivers/net/e1000/e1000_hw.c 3 additions, 1 deletiondrivers/net/e1000/e1000_hw.c
- drivers/net/e1000/e1000_hw.h 1 addition, 0 deletionsdrivers/net/e1000/e1000_hw.h
- drivers/net/e1000e/netdev.c 0 additions, 1 deletiondrivers/net/e1000e/netdev.c
- drivers/net/ixgbe/ixgbe_common.c 3 additions, 0 deletionsdrivers/net/ixgbe/ixgbe_common.c
- drivers/net/ixgbe/ixgbe_fcoe.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_fcoe.c
- drivers/net/ixgbe/ixgbe_main.c 10 additions, 6 deletionsdrivers/net/ixgbe/ixgbe_main.c
- drivers/net/ixgbe/ixgbe_sriov.c 0 additions, 2 deletionsdrivers/net/ixgbe/ixgbe_sriov.c
- drivers/net/ixgbe/ixgbe_x540.c 3 additions, 3 deletionsdrivers/net/ixgbe/ixgbe_x540.c
- drivers/net/sis900.c 1 addition, 0 deletionsdrivers/net/sis900.c
- drivers/net/usb/cdc_ncm.c 147 additions, 80 deletionsdrivers/net/usb/cdc_ncm.c
- drivers/net/wireless/ath/ath9k/ath9k.h 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/ath9k.h
- drivers/net/wireless/ath/ath9k/main.c 0 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/main.c
- drivers/net/wireless/ath/ath9k/xmit.c 6 additions, 1 deletiondrivers/net/wireless/ath/ath9k/xmit.c
- drivers/net/wireless/ath/carl9170/rx.c 1 addition, 1 deletiondrivers/net/wireless/ath/carl9170/rx.c
- drivers/net/wireless/iwlwifi/iwl-6000.c 2 additions, 0 deletionsdrivers/net/wireless/iwlwifi/iwl-6000.c
- drivers/net/wireless/iwlwifi/iwl-agn.c 6 additions, 0 deletionsdrivers/net/wireless/iwlwifi/iwl-agn.c
- drivers/net/wireless/wl1251/main.c 3 additions, 0 deletionsdrivers/net/wireless/wl1251/main.c
Loading
Please register or sign in to comment