Merge branch 'wandboard_imx_3.0.35_4.1.0' of https://github.com/wolfgar/linux into wandboard_imx_3.0.35_4.1.0
Merge branch 'wandboard_imx_3.0.35_4.1.0' of https://github.com/smallint/linux into wandboard_imx_3.0.35_4.1.0