Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwmc3200wifi/netdev.c net/wireless/scan.c
No related branches found
No related tags found
Showing
- CREDITS 1 addition, 1 deletionCREDITS
- Documentation/connector/cn_test.c 2 additions, 2 deletionsDocumentation/connector/cn_test.c
- Documentation/connector/ucon.c 1 addition, 1 deletionDocumentation/connector/ucon.c
- Documentation/networking/6pack.txt 1 addition, 1 deletionDocumentation/networking/6pack.txt
- MAINTAINERS 8 additions, 2 deletionsMAINTAINERS
- drivers/connector/cn_queue.c 1 addition, 1 deletiondrivers/connector/cn_queue.c
- drivers/connector/connector.c 2 additions, 2 deletionsdrivers/connector/connector.c
- drivers/net/Kconfig 7 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/arm/Kconfig 8 additions, 0 deletionsdrivers/net/arm/Kconfig
- drivers/net/arm/Makefile 1 addition, 0 deletionsdrivers/net/arm/Makefile
- drivers/net/arm/at91_ether.c 1 addition, 2 deletionsdrivers/net/arm/at91_ether.c
- drivers/net/arm/w90p910_ether.c 1105 additions, 0 deletionsdrivers/net/arm/w90p910_ether.c
- drivers/net/benet/be_main.c 4 additions, 4 deletionsdrivers/net/benet/be_main.c
- drivers/net/bnx2x_link.c 2 additions, 1 deletiondrivers/net/bnx2x_link.c
- drivers/net/can/dev.c 6 additions, 2 deletionsdrivers/net/can/dev.c
- drivers/net/can/sja1000/sja1000.c 0 additions, 1 deletiondrivers/net/can/sja1000/sja1000.c
- drivers/net/fs_enet/fs_enet-main.c 10 additions, 10 deletionsdrivers/net/fs_enet/fs_enet-main.c
- drivers/net/gianfar.c 8 additions, 16 deletionsdrivers/net/gianfar.c
- drivers/net/hamradio/6pack.c 1 addition, 1 deletiondrivers/net/hamradio/6pack.c
Loading
Please register or sign in to comment