commit | eb3bbf805f8509f03ee479becf8c2f00737e1efb | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 13 18:06:37 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 13 18:06:37 2010 -0700 |
tree | 90ea306a044f4a1788dc87f94411d8572856279d | |
parent | 5e8530810805858892959b8ebbcec1009ea8c12d [diff] | |
parent | eba3f13716740c8a4bc12a987d3391a3c1f79e66 [diff] |
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