Merge remote-tracking branch 'pza/reset/for_v3.10' into imx/soc
authorShawn Guo <shawn.guo@linaro.org>
Fri, 12 Apr 2013 11:00:44 +0000 (19:00 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Fri, 12 Apr 2013 11:00:44 +0000 (19:00 +0800)

Trivial merge