From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Aug 2010 16:17:27 +0000 (-0700)
Subject: Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
X-Git-Tag: v2.6.36-rc1~101
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=946880fa270c18c137654af70ba939f03181c6b6;p=karo-tx-linux.git

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
---

946880fa270c18c137654af70ba939f03181c6b6