Merge branch 'omap-boards' into omap-for-linus