Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 15 Dec 2008 22:13:26 +0000 (22:13 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Dec 2008 22:13:26 +0000 (22:13 +0000)

Trivial merge