]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.4/soc' into for-3.4/t30-smp
authorOlof Johansson <olof@lixom.net>
Sun, 26 Feb 2012 22:42:51 +0000 (14:42 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 26 Feb 2012 22:42:51 +0000 (14:42 -0800)

Trivial merge