Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
No related branches found
No related tags found
Showing
- MAINTAINERS 5 additions, 3 deletionsMAINTAINERS
- drivers/net/b44.c 1 addition, 1 deletiondrivers/net/b44.c
- drivers/net/e100.c 96 additions, 46 deletionsdrivers/net/e100.c
- drivers/net/e1000/e1000.h 39 additions, 12 deletionsdrivers/net/e1000/e1000.h
- drivers/net/e1000/e1000_ethtool.c 119 additions, 48 deletionsdrivers/net/e1000/e1000_ethtool.c
- drivers/net/e1000/e1000_hw.c 42 additions, 11 deletionsdrivers/net/e1000/e1000_hw.c
- drivers/net/e1000/e1000_hw.h 24 additions, 1 deletiondrivers/net/e1000/e1000_hw.h
- drivers/net/e1000/e1000_main.c 534 additions, 280 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/e1000/e1000_param.c 10 additions, 4 deletionsdrivers/net/e1000/e1000_param.c
- drivers/net/mv643xx_eth.c 424 additions, 256 deletionsdrivers/net/mv643xx_eth.c
- drivers/net/skge.c 15 additions, 5 deletionsdrivers/net/skge.c
- drivers/net/sky2.c 136 additions, 83 deletionsdrivers/net/sky2.c
- drivers/net/spider_net.c 265 additions, 247 deletionsdrivers/net/spider_net.c
- drivers/net/spider_net.h 42 additions, 33 deletionsdrivers/net/spider_net.h
- drivers/net/spider_net_ethtool.c 19 additions, 0 deletionsdrivers/net/spider_net_ethtool.c
- drivers/net/wireless/airo.c 10 additions, 11 deletionsdrivers/net/wireless/airo.c
- drivers/net/wireless/atmel.c 2 additions, 2 deletionsdrivers/net/wireless/atmel.c
- drivers/net/wireless/hostap/Kconfig 18 additions, 4 deletionsdrivers/net/wireless/hostap/Kconfig
- drivers/net/wireless/hostap/Makefile 2 additions, 1 deletiondrivers/net/wireless/hostap/Makefile
- drivers/net/wireless/hostap/hostap.h 37 additions, 0 deletionsdrivers/net/wireless/hostap/hostap.h
Loading
Please register or sign in to comment