drivers/mmc/host/omap.c · b1f71bd0328a8c928258d3c8be689ddbc13a8a3b · Kirill Smelkov / linux

Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers · 46cddc01

Tony Lindgren authored Oct 17, 2012

Conflicts:
	arch/arm/mach-omap1/devices.c
	arch/arm/mach-omap2/omap_hwmod_33xx_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	drivers/mmc/host/omap.c

46cddc01

omap.c 38.5 KB

Replace omap.c