Merge branch 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...
authorArnd Bergmann <arnd@arndb.de>
Wed, 7 Dec 2011 10:27:55 +0000 (10:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 7 Dec 2011 10:27:55 +0000 (10:27 +0000)

Trivial merge