Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e100.c drivers/net/e1000e/netdev.c
Showing
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/can/usb/ems_usb.c 4 additions, 4 deletionsdrivers/net/can/usb/ems_usb.c
- drivers/net/cxgb3/ael1002.c 1 addition, 1 deletiondrivers/net/cxgb3/ael1002.c
- drivers/net/cxgb3/cxgb3_main.c 1 addition, 1 deletiondrivers/net/cxgb3/cxgb3_main.c
- drivers/net/e100.c 8 additions, 2 deletionsdrivers/net/e100.c
- drivers/net/e1000e/82571.c 9 additions, 11 deletionsdrivers/net/e1000e/82571.c
- drivers/net/e1000e/e1000.h 4 additions, 1 deletiondrivers/net/e1000e/e1000.h
- drivers/net/e1000e/netdev.c 45 additions, 28 deletionsdrivers/net/e1000e/netdev.c
- drivers/net/fsl_pq_mdio.c 14 additions, 6 deletionsdrivers/net/fsl_pq_mdio.c
- drivers/net/gianfar.c 1 addition, 5 deletionsdrivers/net/gianfar.c
- drivers/net/ixgbe/ixgbe_82599.c 48 additions, 14 deletionsdrivers/net/ixgbe/ixgbe_82599.c
- drivers/net/ixgbe/ixgbe_main.c 12 additions, 10 deletionsdrivers/net/ixgbe/ixgbe_main.c
- drivers/net/ixgbe/ixgbe_type.h 2 additions, 0 deletionsdrivers/net/ixgbe/ixgbe_type.h
- drivers/net/ks8851.c 7 additions, 5 deletionsdrivers/net/ks8851.c
- drivers/net/pcmcia/3c574_cs.c 5 additions, 2 deletionsdrivers/net/pcmcia/3c574_cs.c
- drivers/net/r8169.c 18 additions, 14 deletionsdrivers/net/r8169.c
- drivers/net/tg3.c 1 addition, 0 deletionsdrivers/net/tg3.c
- drivers/net/usb/Kconfig 12 additions, 0 deletionsdrivers/net/usb/Kconfig
- drivers/net/usb/Makefile 1 addition, 0 deletionsdrivers/net/usb/Makefile
- drivers/net/usb/ipheth.c 568 additions, 0 deletionsdrivers/net/usb/ipheth.c
Loading
Please register or sign in to comment