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