Merge branch 'omap-dma-for-v3.10' into omap-daily-testing
Merge branch 'omap-dmtimer-for-v3.10' into omap-daily-testing
Merge branch 'omap-dt-for-v3.10' into omap-daily-testing
Merge branch 'omap-gpio-for-v3.10' into omap-daily-testing
Merge branch 'omap-gpmc-for-v3.10' into omap-daily-testing

Conflicts:
	arch/arm/mach-omap2/gpmc.c
Merge branch 'omap-timer-for-v3.10' into omap-daily-testing

Conflicts:
	arch/arm/mach-omap2/timer.c
Merge branch 'omap-for-test-only' into omap-daily-testing