Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle