Merge branch 'omap-for-v4.10/legacy' into omap-for-v4.10/fixes