arch/arm/mach-omap2/board-rm680.c · 46cddc01aa6a017193ae7320ef8bfc8242782a66 · 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

board-rm680.c 4.11 KB

Replace board-rm680.c