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