Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa...
authorArnd Bergmann <arnd@arndb.de>
Sun, 17 Jul 2011 19:31:38 +0000 (21:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 17 Jul 2011 19:31:38 +0000 (21:31 +0200)

Trivial merge