Merge branch 'omap/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 30 Sep 2011 20:54:11 +0000 (22:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 30 Sep 2011 20:54:11 +0000 (22:54 +0200)

Trivial merge