Merge branch 'omap-for-v4.4/cleanup' into for-next