| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 11 Aug 2010 16:17:27 +0000 (09:17 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 11 Aug 2010 16:17:27 +0000 (09:17 -0700) |
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
IXP4xx: Fix LL debugging on little-endian CPU.
IXP4xx: Fix sparse warnings in I/O primitives.
IXP4xx: Make mdio_bus struct static in the Ethernet driver.
IXP4xx: Fix ixp4xx_crypto little-endian operation.
IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.
ixp4xx/vulcan: add PCI support
ixp4xx: base support for Arcom Vulcan
IXP4xx: Fix LL debugging on little-endian CPU.
IXP4xx: Fix sparse warnings in I/O primitives.
IXP4xx: Make mdio_bus struct static in the Ethernet driver.
IXP4xx: Fix ixp4xx_crypto little-endian operation.
IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.
ixp4xx/vulcan: add PCI support
ixp4xx: base support for Arcom Vulcan
| 1 | 2 | |||
|---|---|---|---|---|
| drivers/net/arm/ixp4xx_eth.c | patch | | diff1 | | diff2 | | blob | history |
| drivers/net/wan/ixp4xx_hss.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/net/arm/ixp4xx_eth.c
Simple merge
diff --cc drivers/net/wan/ixp4xx_hss.c
Simple merge