Merge branch 'omap/fixes-for-3.1' into fixes
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:21:07 +0000 (22:21 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:21:07 +0000 (22:21 +0200)

Trivial merge