Merge branch 'samsung/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:15:55 +0000 (22:15 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:15:55 +0000 (22:15 +0200)

Trivial merge