Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:11:47 +0000 (21:11 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:11:47 +0000 (21:11 -0800)

Trivial merge