Merge branch 'omap-fixes' into fixes
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 May 2007 15:10:03 +0000 (16:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 May 2007 15:10:24 +0000 (16:10 +0100)

Trivial merge