Merge branches 'samsung/cleanup' and 'samsung/s5p-cleanup-v2', tag 'v3.16-rc6' into...
authorArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 09:58:35 +0000 (11:58 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 09:59:20 +0000 (11:59 +0200)
The following samsung branches are based on these cleanups,
which are already in mainline before this branch gets pulled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge