Merge branch 'samsung-fixes-2' of git://github.com/kgene/linux-samsung into HEAD
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Sep 2011 15:28:07 +0000 (17:28 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Sep 2011 15:28:07 +0000 (17:28 +0200)

Trivial merge