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