Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2...