Tony Lindgren 2da8a79f7d Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers ... Conflicts: arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-n8x0.c		2012-10-25 12:21:48 -07:00
..
plat	Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers	2012-10-25 12:21:48 -07:00
plat-omap	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00