]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/w1/slaves/w1_ds2431.c
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 16:17:27 +0000 (09:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 16:17:27 +0000 (09:17 -0700)
commit946880fa270c18c137654af70ba939f03181c6b6
tree1fc66f0f55c17be3026d55fc261f4cbddaf80e90
parent636d17427b1ef0e97bd9df9b3b0e0f314ff889d3
parent42ea573f872365b0797ddbcee2e1f1f48913f507
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

* '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
drivers/net/arm/ixp4xx_eth.c
drivers/net/wan/ixp4xx_hss.c