Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 22 Jun 2008 14:03:20 +0000 (15:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 22 Jun 2008 14:03:20 +0000 (15:03 +0100)

Trivial merge