Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c
No related branches found
No related tags found
Showing
- Documentation/networking/ip-sysctl.txt 1 addition, 0 deletionsDocumentation/networking/ip-sysctl.txt
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- drivers/bluetooth/ath3k.c 4 additions, 0 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/btusb.c 9 additions, 3 deletionsdrivers/bluetooth/btusb.c
- drivers/isdn/icn/icn.c 4 additions, 3 deletionsdrivers/isdn/icn/icn.c
- drivers/net/Kconfig 3 additions, 3 deletionsdrivers/net/Kconfig
- drivers/net/atl1c/atl1c_hw.c 1 addition, 1 deletiondrivers/net/atl1c/atl1c_hw.c
- drivers/net/au1000_eth.c 5 additions, 5 deletionsdrivers/net/au1000_eth.c
- drivers/net/b44.c 5 additions, 6 deletionsdrivers/net/b44.c
- drivers/net/benet/be_cmds.c 1 addition, 1 deletiondrivers/net/benet/be_cmds.c
- drivers/net/bonding/bond_main.c 1 addition, 1 deletiondrivers/net/bonding/bond_main.c
- drivers/net/caif/caif_shm_u5500.c 1 addition, 1 deletiondrivers/net/caif/caif_shm_u5500.c
- drivers/net/caif/caif_shmcore.c 1 addition, 1 deletiondrivers/net/caif/caif_shmcore.c
- drivers/net/cxgb4/t4_hw.c 1 addition, 1 deletiondrivers/net/cxgb4/t4_hw.c
- drivers/net/cxgb4vf/cxgb4vf_main.c 45 additions, 28 deletionsdrivers/net/cxgb4vf/cxgb4vf_main.c
- drivers/net/cxgb4vf/t4vf_hw.c 59 additions, 35 deletionsdrivers/net/cxgb4vf/t4vf_hw.c
- drivers/net/e1000/e1000_main.c 8 additions, 4 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/ehea/ehea_ethtool.c 9 additions, 0 deletionsdrivers/net/ehea/ehea_ethtool.c
- drivers/net/ehea/ehea_main.c 19 additions, 6 deletionsdrivers/net/ehea/ehea_main.c
- drivers/net/ifb.c 2 additions, 0 deletionsdrivers/net/ifb.c
Loading
Please register or sign in to comment