From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Aug 2010 01:06:37 +0000 (-0700)
Subject: Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
X-Git-Tag: v2.6.36-rc1~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eb3bbf805f8509f03ee479becf8c2f00737e1efb;p=~emulex%2Finfiniband.git

Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM
  mmc: msm_sdcc: Compile the driver for msm7x30
  mmc: msm: fix up build breakage on !PM
---

eb3bbf805f8509f03ee479becf8c2f00737e1efb