Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:22:37 +0000 (20:22 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:22:37 +0000 (20:22 +0000)

Trivial merge