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