Merge branch 'at91' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 10 Jun 2009 21:39:58 +0000 (22:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 10 Jun 2009 21:39:58 +0000 (22:39 +0100)

Trivial merge