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: firefly_0821_release~176^2~2908
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=381e3554750930e0579aa06f78afc9d6215fc62a;p=firefly-linux-kernel-4.4.55.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