Merge branch 'next-samsung-cleanup-spi4' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 23:56:51 +0000 (23:56 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 23:56:51 +0000 (23:56 +0000)

Trivial merge