]> git.openpandora.org Git - pandora-kernel.git/commitdiff
Merge branch 'omap/soc' into next/soc
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)

Trivial merge