]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.3/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 8 Dec 2011 05:22:13 +0000 (21:22 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 8 Dec 2011 05:22:13 +0000 (21:22 -0800)

Trivial merge