tree faf9f83e78ae24f6730d64999a89c35144da3b8a
parent 50260924afd4b745bfb6e5f1caee381a1875fc31
parent a0f5e3631b07cabf624e7d818df76d47d9d21017
author Shawn Guo <shawn.guo@linaro.org> 1336800729 +0800
committer Shawn Guo <shawn.guo@linaro.org> 1336800729 +0800

Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5