Merge branch 'samsung/cleanup' into next/cleanup2
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 Jan 2012 16:06:31 +0000 (16:06 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 Jan 2012 16:06:31 +0000 (16:06 +0000)

Trivial merge