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