]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e85308 eba3f13)
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)
* '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

1  2 
drivers/mmc/host/Kconfig patch | diff1 | diff2 | blob | history
drivers/mmc/host/Makefile patch | diff1 | diff2 | blob | history
drivers/mmc/host/msm_sdcc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/mmc/host/Kconfig
Simple merge
diff --cc drivers/mmc/host/Makefile
Simple merge
diff --cc drivers/mmc/host/msm_sdcc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.