]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pza/reset/for_v3.10' into imx/soc
authorShawn Guo <shawn.guo@linaro.org>
Mon, 1 Apr 2013 08:44:44 +0000 (16:44 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 1 Apr 2013 08:44:44 +0000 (16:44 +0800)

Trivial merge