Merge branch 'samsung/exynos-multiplatform' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 12:34:05 +0000 (14:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 14:50:56 +0000 (16:50 +0200)
Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.

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

Trivial merge