Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 25 May 2009 12:35:46 +0000 (13:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 25 May 2009 12:35:46 +0000 (13:35 +0100)

Trivial merge