diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 03:06:37 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 03:06:37 +0200 |
commit | eb3bbf805f8509f03ee479becf8c2f00737e1efb (patch) | |
tree | 90ea306a044f4a1788dc87f94411d8572856279d /fs | |
parent | Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM (diff) | |
download | linux-eb3bbf805f8509f03ee479becf8c2f00737e1efb.tar.xz linux-eb3bbf805f8509f03ee479becf8c2f00737e1efb.zip |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions