Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes
authorArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:20:25 +0000 (23:20 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:20:25 +0000 (23:20 +0200)

Trivial merge