Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 10 Aug 2009 13:23:29 +0000 (14:23 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 10 Aug 2009 13:23:29 +0000 (14:23 +0100)

Trivial merge