arch/arm/mach-omap2/gpmc.c · 6832c95599e1a04f4b56b533718d1cda4689aec2 · Kirill Smelkov / linux

Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers · 6832c955

Tony Lindgren authored Oct 17, 2012

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

6832c955

gpmc.c 22.2 KB

Replace gpmc.c