From: Tony Lindgren Date: Wed, 17 Oct 2012 18:13:42 +0000 (-0700) Subject: Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers X-Git-Tag: omap-for-v3.8/cleanup-headers-signed~20 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46cddc01aa6a017193ae7320ef8bfc8242782a66;p=pandora-kernel.git 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 --- 46cddc01aa6a017193ae7320ef8bfc8242782a66 Reading git-diff-tree failed