Merge branch 'ixp4xx-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chris...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 13 Aug 2009 08:55:38 +0000 (09:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 13 Aug 2009 08:55:38 +0000 (09:55 +0100)

Trivial merge