Merge branch 'omap-rmk'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 27 Aug 2008 22:07:46 +0000 (23:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Aug 2008 22:07:46 +0000 (23:07 +0100)

Trivial merge