Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 01:06:37 +0000 (18:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 01:06:37 +0000 (18:06 -0700)
commiteb3bbf805f8509f03ee479becf8c2f00737e1efb
tree90ea306a044f4a1788dc87f94411d8572856279d
parent5e8530810805858892959b8ebbcec1009ea8c12d
parenteba3f13716740c8a4bc12a987d3391a3c1f79e66
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
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
drivers/mmc/host/msm_sdcc.c