ARM: dts: Add NOR flash bindings for OMAP2420 H4

Add device-tree node for the 64MB NOR on the OMAP2420-H4 board.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
ARM: dts: Add OMAP3430 SDP NOR flash memory binding

Add device-tree node for the 128MB NOR on the OMAP3423-SDP board.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
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-take2' 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