Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3