Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 25 Aug 2007 11:38:47 +0000 (12:38 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 25 Aug 2007 11:38:47 +0000 (12:38 +0100)

Trivial merge