Merge branch 'omap-rmk'
authorRussell King <[email protected]>
Wed, 27 Aug 2008 22:07:46 +0000 (23:07 +0100)
committerRussell King <[email protected]>
Wed, 27 Aug 2008 22:07:46 +0000 (23:07 +0100)

Trivial merge