Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 10 Oct 2008 22:10:10 +0000 (23:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 10 Oct 2008 22:10:10 +0000 (23:10 +0100)

Trivial merge