From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Nov 2014 19:29:45 +0000 (-0800)
Subject: Merge tag 'mmc-v3.18-2' of git://git.linaro.org/people/ulf.hansson/mmc
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~154
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=381e3554750930e0579aa06f78afc9d6215fc62a;p=pandora-kernel.git

Merge tag 'mmc-v3.18-2' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC fix from Ulf Hansson:
 "Fix card detection regression in the MMC core.

  The MMC_CAP2_CD_ACTIVE_HIGH and MMC_CAP2_RO_ACTIVE_HIGH could under
  some circumstances be set incorrectly, causing the card detection to
  fail"

* tag 'mmc-v3.18-2' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: core: fix card detection regression
---

381e3554750930e0579aa06f78afc9d6215fc62a
Reading git-diff-tree failed