Merge branch 'omap2-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 16:21:34 +0000 (17:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 16:21:34 +0000 (17:21 +0100)

Trivial merge