Merge branch 'devel-omap-smp-on-up' into omap-for-linus