Merge branch 'davinci/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Wed, 21 Sep 2011 14:20:17 +0000 (14:20 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 21 Sep 2011 14:20:17 +0000 (14:20 +0000)

Trivial merge