Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:20:13 +0000 (14:20 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:20:13 +0000 (14:20 +0000)

Trivial merge