Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus