Merge branch 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 07:34:17 +0000 (23:34 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 07:34:17 +0000 (23:34 -0800)

Trivial merge