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