Merge branch 'at91' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:31:58 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:31:58 +0000 (21:31 +0100)

Trivial merge