Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 May 2007 09:41:28 +0000 (10:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 May 2007 09:41:28 +0000 (10:41 +0100)

Trivial merge