Merge branch 'omap/headers4' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:06:24 +0000 (17:06 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:06:24 +0000 (17:06 +0100)

Trivial merge