Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 2 Mar 2007 11:59:16 +0000 (11:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 2 Mar 2007 12:04:16 +0000 (12:04 +0000)

Trivial merge