Tony Lindgren 6832c95599 Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers ... Conflicts: arch/arm/mach-omap2/board-omap3logic.c arch/arm/mach-omap2/gpmc.c drivers/media/platform/omap/omap_vout.c drivers/media/platform/omap/omap_vout_vrfb.c		2012-10-17 11:21:34 -07:00
..
Kconfig	…
Makefile	[media] Fix some Makefile rules	2012-08-16 19:55:03 -03:00
omap_vout.c	Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers	2012-10-17 11:21:34 -07:00
omap_vout_vrfb.c	Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers	2012-10-17 11:21:34 -07:00
omap_vout_vrfb.h	…
omap_voutdef.h	OMAP: move arch/arm/plat-omap/include/plat/vrfb.h	2012-10-17 12:11:12 +03:00
omap_voutlib.c	…
omap_voutlib.h	…