Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/tg3.c
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- drivers/net/amd8111e.c 1 addition, 1 deletiondrivers/net/amd8111e.c
- drivers/net/bnx2.c 2 additions, 0 deletionsdrivers/net/bnx2.c
- drivers/net/can/sja1000/sja1000.c 1 addition, 1 deletiondrivers/net/can/sja1000/sja1000.c
- drivers/net/ftmac100.c 4 additions, 4 deletionsdrivers/net/ftmac100.c
- drivers/net/mii.c 4 additions, 0 deletionsdrivers/net/mii.c
- drivers/net/tg3.c 6 additions, 2 deletionsdrivers/net/tg3.c
- drivers/net/usb/cdc_ether.c 12 additions, 2 deletionsdrivers/net/usb/cdc_ether.c
- drivers/net/usb/smsc95xx.c 1 addition, 1 deletiondrivers/net/usb/smsc95xx.c
- drivers/net/usb/usbnet.c 15 additions, 3 deletionsdrivers/net/usb/usbnet.c
- drivers/net/veth.c 12 additions, 0 deletionsdrivers/net/veth.c
- drivers/net/wireless/b43/main.c 1 addition, 0 deletionsdrivers/net/wireless/b43/main.c
- drivers/net/wireless/iwlegacy/iwl-4965-tx.c 12 additions, 6 deletionsdrivers/net/wireless/iwlegacy/iwl-4965-tx.c
- drivers/net/wireless/iwlegacy/iwl-led.c 19 additions, 1 deletiondrivers/net/wireless/iwlegacy/iwl-led.c
- drivers/net/wireless/iwlegacy/iwl4965-base.c 4 additions, 4 deletionsdrivers/net/wireless/iwlegacy/iwl4965-base.c
- drivers/net/wireless/iwlwifi/iwl-agn-tx.c 11 additions, 6 deletionsdrivers/net/wireless/iwlwifi/iwl-agn-tx.c
- include/linux/usb/usbnet.h 1 addition, 0 deletionsinclude/linux/usb/usbnet.h
- net/core/dev.c 3 additions, 3 deletionsnet/core/dev.c
- net/dsa/Kconfig 2 additions, 2 deletionsnet/dsa/Kconfig
- net/dsa/mv88e6131.c 21 additions, 5 deletionsnet/dsa/mv88e6131.c
Loading
Please register or sign in to comment