Merge branch 'omap/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 19:45:56 +0000 (21:45 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 19:45:56 +0000 (21:45 +0200)

Trivial merge