Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 10 Aug 2009 13:24:18 +0000 (14:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 10 Aug 2009 13:24:18 +0000 (14:24 +0100)

Trivial merge