Merge branch 'imx-board-ifdefs' into imx-for-2.6.39