Merge branch 'omap/cleanup' into next/cleanup2
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:22:54 +0000 (00:22 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:22:54 +0000 (00:22 +0100)

Trivial merge