Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next...
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:59:57 +0000 (21:59 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:59:57 +0000 (21:59 +0200)

Trivial merge