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