From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 01:05:14 +0000 (+1100)
Subject: Merge remote-tracking branch 'mmc/mmc-next'
X-Git-Tag: next-20121008~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8ec749d77232ed6f41315418519742ffc7eaf57;p=karo-tx-linux.git

Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
	drivers/mmc/host/davinci_mmc.c
	drivers/mmc/host/omap.c
---

a8ec749d77232ed6f41315418519742ffc7eaf57