Merge branch 'davinci/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 14:20:49 +0000 (14:20 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 14:20:49 +0000 (14:20 +0000)

Trivial merge