From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Oct 2012 02:07:40 +0000 (+0900)
Subject: Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.7-rc1~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=125aae1d7f51ee28d821a1374a2b7be13972c5dc;p=~emulex%2Finfiniband.git

Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

Pull two more mmc changes from Chris Ball:

 - Disintegrate UAPI

 - fix a mismerge that caused a build error.

* tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  UAPI: (Scripted) Disintegrate include/linux/mmc
  mmc: mxs-mmc: Fix merge issue causing build error
---

125aae1d7f51ee28d821a1374a2b7be13972c5dc