Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/sh_eth.c
No related branches found
No related tags found
Showing
- drivers/isdn/i4l/isdn_net.h 3 additions, 3 deletionsdrivers/isdn/i4l/isdn_net.h
- drivers/net/Kconfig 4 additions, 1 deletiondrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/au1000_eth.c 1 addition, 0 deletionsdrivers/net/au1000_eth.c
- drivers/net/benet/be_cmds.c 22 additions, 11 deletionsdrivers/net/benet/be_cmds.c
- drivers/net/benet/be_cmds.h 3 additions, 2 deletionsdrivers/net/benet/be_cmds.h
- drivers/net/benet/be_main.c 15 additions, 12 deletionsdrivers/net/benet/be_main.c
- drivers/net/bonding/bond_main.c 4 additions, 4 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/can/sja1000/sja1000_of_platform.c 1 addition, 0 deletionsdrivers/net/can/sja1000/sja1000_of_platform.c
- drivers/net/dm9000.h 1 addition, 1 deletiondrivers/net/dm9000.h
- drivers/net/e1000e/e1000.h 12 additions, 0 deletionsdrivers/net/e1000e/e1000.h
- drivers/net/e1000e/hw.h 2 additions, 0 deletionsdrivers/net/e1000e/hw.h
- drivers/net/e1000e/ich8lan.c 115 additions, 35 deletionsdrivers/net/e1000e/ich8lan.c
- drivers/net/e1000e/phy.c 328 additions, 141 deletionsdrivers/net/e1000e/phy.c
- drivers/net/ethoc.c 11 additions, 10 deletionsdrivers/net/ethoc.c
- drivers/net/fec.c 1 addition, 1 deletiondrivers/net/fec.c
- drivers/net/fec_mpc52xx.c 0 additions, 6 deletionsdrivers/net/fec_mpc52xx.c
- drivers/net/fec_mpc52xx_phy.c 1 addition, 0 deletionsdrivers/net/fec_mpc52xx_phy.c
- drivers/net/fs_enet/fs_enet-main.c 1 addition, 0 deletionsdrivers/net/fs_enet/fs_enet-main.c
- drivers/net/fs_enet/mii-bitbang.c 1 addition, 0 deletionsdrivers/net/fs_enet/mii-bitbang.c
Loading
Please register or sign in to comment