Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:13:42 +0000 (11:13 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:13:42 +0000 (11:13 -0700)
commit46cddc01aa6a017193ae7320ef8bfc8242782a66
treeda67a2fb45e512689bf909b4f832a8daea57e140
parent99f0b8d6b09b0db6452d0d6e252bfa28049bbea9
parent53db20d123f7a1bf44e46b727775403672655fde
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
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/mmc/host/omap.c