Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
Showing
- arch/powerpc/include/asm/8xx_immap.h 2 additions, 2 deletionsarch/powerpc/include/asm/8xx_immap.h
- drivers/net/atl1c/atl1c.h 3 additions, 3 deletionsdrivers/net/atl1c/atl1c.h
- drivers/net/atl1c/atl1c_main.c 5 additions, 9 deletionsdrivers/net/atl1c/atl1c_main.c
- drivers/net/benet/be_main.c 1 addition, 0 deletionsdrivers/net/benet/be_main.c
- drivers/net/bnx2x/bnx2x_cmn.c 24 additions, 10 deletionsdrivers/net/bnx2x/bnx2x_cmn.c
- drivers/net/bonding/bond_3ad.c 5 additions, 2 deletionsdrivers/net/bonding/bond_3ad.c
- drivers/net/ehea/ehea_main.c 6 additions, 3 deletionsdrivers/net/ehea/ehea_main.c
- drivers/net/fs_enet/mac-fec.c 4 additions, 4 deletionsdrivers/net/fs_enet/mac-fec.c
- drivers/net/netconsole.c 8 additions, 0 deletionsdrivers/net/netconsole.c
- drivers/net/r8169.c 76 additions, 32 deletionsdrivers/net/r8169.c
- drivers/net/usb/cdc_ncm.c 2 additions, 2 deletionsdrivers/net/usb/cdc_ncm.c
- drivers/net/wireless/ath/ath9k/recv.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/recv.c
- drivers/net/wireless/iwlegacy/iwl-4965-tx.c 7 additions, 3 deletionsdrivers/net/wireless/iwlegacy/iwl-4965-tx.c
- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c 1 addition, 6 deletionsdrivers/net/wireless/iwlwifi/iwl-agn-rxon.c
- drivers/net/wireless/iwlwifi/iwl-agn-tx.c 7 additions, 3 deletionsdrivers/net/wireless/iwlwifi/iwl-agn-tx.c
- net/bluetooth/hci_core.c 2 additions, 3 deletionsnet/bluetooth/hci_core.c
- net/bluetooth/hci_event.c 0 additions, 2 deletionsnet/bluetooth/hci_event.c
- net/bluetooth/l2cap_core.c 1 addition, 0 deletionsnet/bluetooth/l2cap_core.c
- net/bluetooth/sco.c 9 additions, 0 deletionsnet/bluetooth/sco.c
- net/bridge/br_input.c 1 addition, 1 deletionnet/bridge/br_input.c
Loading
Please register or sign in to comment