Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/vmxnet3/vmxnet3_ethtool.c net/core/dev.c
No related branches found
No related tags found
Showing
- drivers/net/Makefile 3 additions, 3 deletionsdrivers/net/Makefile
- drivers/net/bonding/bond_3ad.h 5 additions, 5 deletionsdrivers/net/bonding/bond_3ad.h
- drivers/net/ehea/ehea_main.c 3 additions, 3 deletionsdrivers/net/ehea/ehea_main.c
- drivers/net/hydra.c 7 additions, 7 deletionsdrivers/net/hydra.c
- drivers/net/ne-h8300.c 8 additions, 8 deletionsdrivers/net/ne-h8300.c
- drivers/net/sfc/mcdi.c 30 additions, 19 deletionsdrivers/net/sfc/mcdi.c
- drivers/net/sfc/nic.c 7 additions, 0 deletionsdrivers/net/sfc/nic.c
- drivers/net/sfc/nic.h 2 additions, 0 deletionsdrivers/net/sfc/nic.h
- drivers/net/sfc/siena.c 21 additions, 4 deletionsdrivers/net/sfc/siena.c
- drivers/net/vmxnet3/vmxnet3_ethtool.c 1 addition, 0 deletionsdrivers/net/vmxnet3/vmxnet3_ethtool.c
- drivers/net/wireless/ath/ath9k/main.c 8 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/main.c
- drivers/net/wireless/iwlegacy/iwl-core.c 7 additions, 0 deletionsdrivers/net/wireless/iwlegacy/iwl-core.c
- drivers/net/wireless/iwlegacy/iwl-dev.h 6 additions, 0 deletionsdrivers/net/wireless/iwlegacy/iwl-dev.h
- drivers/net/wireless/libertas/cmd.c 4 additions, 2 deletionsdrivers/net/wireless/libertas/cmd.c
- drivers/net/zorro8390.c 6 additions, 6 deletionsdrivers/net/zorro8390.c
- include/net/inet_ecn.h 13 additions, 3 deletionsinclude/net/inet_ecn.h
- include/net/llc_pdu.h 4 additions, 4 deletionsinclude/net/llc_pdu.h
- net/bridge/br_netfilter.c 1 addition, 1 deletionnet/bridge/br_netfilter.c
- net/core/dev.c 10 additions, 16 deletionsnet/core/dev.c
- net/core/ethtool.c 1 addition, 1 deletionnet/core/ethtool.c
Loading
Please register or sign in to comment