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

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
This commit is contained in:
Tony Lindgren 2012-10-17 11:13:42 -07:00
commit 46cddc01aa
25 changed files with 236 additions and 223 deletions