Merge branch 'for_3.10/omap5_pm' into testing/3.10/omap5-int-rebuild
Merge branch 'wip/temp-useful-hacks' into testing/3.10/omap5-int-rebuild