Tony Lindgren f56f52e02a Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt ... Conflicts: arch/arm/plat-omap/dmtimer.c Resolved as suggested by Jon Hunter.		2012-11-09 14:54:17 -08:00
..
plat	Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt	2012-11-09 14:54:17 -08:00
plat-omap	ARM: OMAP: Remove omap_init_consistent_dma_size()	2012-11-06 16:01:19 -08:00