Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts: drivers/s390/net/qeth_main.c
No related branches found
No related tags found
Showing
- Documentation/feature-removal-schedule.txt 0 additions, 10 deletionsDocumentation/feature-removal-schedule.txt
- arch/s390/defconfig 3 additions, 5 deletionsarch/s390/defconfig
- drivers/net/8390.c 4 additions, 2 deletionsdrivers/net/8390.c
- drivers/net/Kconfig 0 additions, 87 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 2 deletionsdrivers/net/Makefile
- drivers/net/appletalk/cops.c 4 additions, 2 deletionsdrivers/net/appletalk/cops.c
- drivers/net/arcnet/com20020.c 4 additions, 3 deletionsdrivers/net/arcnet/com20020.c
- drivers/net/at1700.c 4 additions, 3 deletionsdrivers/net/at1700.c
- drivers/net/atarilance.c 4 additions, 3 deletionsdrivers/net/atarilance.c
- drivers/net/atl1/atl1.h 0 additions, 286 deletionsdrivers/net/atl1/atl1.h
- drivers/net/atl1/atl1_ethtool.c 0 additions, 505 deletionsdrivers/net/atl1/atl1_ethtool.c
- drivers/net/atl1/atl1_hw.c 0 additions, 720 deletionsdrivers/net/atl1/atl1_hw.c
- drivers/net/atl1/atl1_hw.h 0 additions, 946 deletionsdrivers/net/atl1/atl1_hw.h
- drivers/net/atlx/Makefile 1 addition, 0 deletionsdrivers/net/atlx/Makefile
- drivers/net/atlx/atl1.c 1636 additions, 522 deletionsdrivers/net/atlx/atl1.c
- drivers/net/atlx/atl1.h 796 additions, 0 deletionsdrivers/net/atlx/atl1.h
- drivers/net/atlx/atlx.c 433 additions, 0 deletionsdrivers/net/atlx/atlx.c
- drivers/net/atlx/atlx.h 506 additions, 0 deletionsdrivers/net/atlx/atlx.h
- drivers/net/ixgbe/ixgbe.h 76 additions, 11 deletionsdrivers/net/ixgbe/ixgbe.h
- drivers/net/ixgbe/ixgbe_ethtool.c 28 additions, 11 deletionsdrivers/net/ixgbe/ixgbe_ethtool.c
Loading
Please register or sign in to comment