Merge branch 'for_3.10/misc_fixes_posted' into testing/3.10/omap5-int-rebuild
Merge branch 'for_3.10/jon-hunter/dev-dt-dma' into testing/3.10/omap5-int-rebuild
Merge branch 'for_3.10/omap_generic_cleanup' into testing/3.10/omap5-int-rebuild
Merge branch 'for_3.10/omap_dt_update' into testing/3.10/omap5-int-rebuild

Conflicts:
	arch/arm/boot/dts/omap5.dtsi
Merge branch 'for_3.10/omap5_generic_updates' into testing/3.10/omap5-int-rebuild
Merge branch 'for_3.10/omap5_data_files' into testing/3.10/omap5-int-rebuild
Merge branch 'for_3.10/omap5_pm' into testing/3.10/omap5-int-rebuild
Merge branch 'wip/dt-useful-debug' into testing/3.10/omap5-int-rebuild