Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (118 commits) [netdrvr] skge: build fix [PATCH] NetXen: driver cleanup, removed unnecessary __iomem type casts [PATCH] PHY: Add support for configuring the PHY connection interface [PATCH] chelesio: transmit locking (plus bug fix). [PATCH] chelsio: statistics improvement [PATCH] chelsio: add MSI support [PATCH] chelsio: use standard CRC routines [PATCH] chelsio: cleanup pm3393 code [PATCH] chelsio: add 1G swcixw aupport [PATCH] chelsio: add support for other 10G boards [PATCH] chelsio: remove unused mutex [PATCH] chelsio: use kzalloc [PATCH] chelsio: whitespace fixes [PATCH] amd8111e use standard CRC lib [PATCH] sky2: msi enhancements. [PATCH] sky2: kfree_skb_any needed [PATCH] sky2: fixes for Yukon EC_U chip revisions [PATCH] sky2: add Dlink 560SX id [PATCH] sky2: receive error handling fix [PATCH] skge: don't clear MC state on link down ...
Showing
- Documentation/networking/e1000.txt 266 additions, 185 deletionsDocumentation/networking/e1000.txt
- Documentation/networking/phy.txt 9 additions, 4 deletionsDocumentation/networking/phy.txt
- MAINTAINERS 14 additions, 0 deletionsMAINTAINERS
- drivers/net/8390.c 8 additions, 1072 deletionsdrivers/net/8390.c
- drivers/net/8390.h 8 additions, 29 deletionsdrivers/net/8390.h
- drivers/net/Kconfig 36 additions, 3 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 8 additions, 5 deletionsdrivers/net/Makefile
- drivers/net/amd8111e.c 1 addition, 26 deletionsdrivers/net/amd8111e.c
- drivers/net/amd8111e.h 0 additions, 4 deletionsdrivers/net/amd8111e.h
- drivers/net/arm/etherh.c 23 additions, 16 deletionsdrivers/net/arm/etherh.c
- drivers/net/au1000_eth.c 2 additions, 1 deletiondrivers/net/au1000_eth.c
- drivers/net/chelsio/Makefile 4 additions, 4 deletionsdrivers/net/chelsio/Makefile
- drivers/net/chelsio/common.h 91 additions, 14 deletionsdrivers/net/chelsio/common.h
- drivers/net/chelsio/cphy.h 23 additions, 1 deletiondrivers/net/chelsio/cphy.h
- drivers/net/chelsio/cpl5_cmd.h 502 additions, 8 deletionsdrivers/net/chelsio/cpl5_cmd.h
- drivers/net/chelsio/cxgb2.c 386 additions, 205 deletionsdrivers/net/chelsio/cxgb2.c
- drivers/net/chelsio/elmer0.h 7 additions, 0 deletionsdrivers/net/chelsio/elmer0.h
- drivers/net/chelsio/espi.c 120 additions, 85 deletionsdrivers/net/chelsio/espi.c
- drivers/net/chelsio/espi.h 1 addition, 0 deletionsdrivers/net/chelsio/espi.h
- drivers/net/chelsio/fpga_defs.h 232 additions, 0 deletionsdrivers/net/chelsio/fpga_defs.h
Loading
Please register or sign in to comment