Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:08:19 +0000 (15:08 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 15:08:19 +0000 (15:08 +0000)

Trivial merge