Merge branch 'omap4_upstream' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 3 Aug 2009 15:41:55 +0000 (16:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Aug 2009 15:41:55 +0000 (16:41 +0100)

Trivial merge