Merge branches 'imx/cleanup' and 'stericsson/cleanup' of git+ssh://master.kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:49:05 +0000 (15:49 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:49:05 +0000 (15:49 +0000)

Trivial merge