Merge commit 'c0053bd50af5' into omap-for-v4.8/soc