summaryrefslogtreecommitdiff
path: root/include/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-12 20:06:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-12 20:06:13 -0800
commit71fe5ccac7ede00526de490a2df10ebcd39c4c11 (patch)
treef327328400e51b47d47f6957d010496ff7e308aa /include/pcmcia
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parent49df78074963c97e25debc3c67b72f059111607d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined mmc: sdhci-s3c: Remove old and misprototyped suspend operations mmc: tmio: fix clock gating on platforms with a .set_pwr() method mmc: sh_mmcif: fix clock gating on platforms with a .down_pwr() method mmc: core: Fix typo at mmc_card_sleep mmc: core: Fix power_off_notify during suspend mmc: core: Fix setting power notify state variable for non-eMMC mmc: core: Add quirk for long data read time mmc: Add module.h include to sdhci-cns3xxx.c mmc: mxcmmc: fix falling back to PIO mmc: omap_hsmmc: DMA unmap only once in case of MMC error
Diffstat (limited to 'include/pcmcia')
0 files changed, 0 insertions, 0 deletions