Merge branch 'omap/fixes' into fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:06:36 +0000 (21:06 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:06:36 +0000 (21:06 +0200)

Trivial merge