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: (83 commits) mmc: fix compile error when CONFIG_BLOCK is not enabled mmc: core: Cleanup eMMC4.5 conditionals mmc: omap_hsmmc: if multiblock reads are broken, disable them mmc: core: add workaround for controllers with broken multiblock reads mmc: core: Prevent too long response times for suspend mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00 mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode mmc: core: support HPI send command mmc: core: Add cache control for eMMC4.5 device mmc: core: Modify the timeout value for writing power class mmc: core: new discard feature support at eMMC v4.5 mmc: core: mmc sanitize feature support for v4.5 mmc: dw_mmc: modify DATA register offset mmc: sdhci-pci: add flag for devices that can support runtime PM mmc: omap_hsmmc: ensure pbias configuration is always done mmc: core: Add Power Off Notify Feature eMMC 4.5 mmc: sdhci-s3c: fix potential NULL dereference mmc: replace printk with appropriate display macro mmc: core: Add default timeout value for CMD6 mmc: sdhci-pci: add runtime pm support ...
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt 27 additions, 0 deletionsDocumentation/devicetree/bindings/mmc/nvidia-sdhci.txt
- Documentation/fault-injection/fault-injection.txt 7 additions, 1 deletionDocumentation/fault-injection/fault-injection.txt
- arch/arm/mach-at91/at91sam9260_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9260_devices.c
- arch/arm/mach-msm/devices-msm7x00.c 0 additions, 24 deletionsarch/arm/mach-msm/devices-msm7x00.c
- arch/arm/mach-msm/devices-qsd8x50.c 0 additions, 24 deletionsarch/arm/mach-msm/devices-qsd8x50.c
- arch/arm/mach-msm/include/mach/mmc.h 1 addition, 8 deletionsarch/arm/mach-msm/include/mach/mmc.h
- arch/arm/mach-shmobile/board-ag5evm.c 6 additions, 0 deletionsarch/arm/mach-shmobile/board-ag5evm.c
- arch/arm/mach-shmobile/board-mackerel.c 6 additions, 0 deletionsarch/arm/mach-shmobile/board-mackerel.c
- arch/arm/plat-omap/include/plat/mmc.h 18 additions, 1 deletionarch/arm/plat-omap/include/plat/mmc.h
- drivers/mmc/card/block.c 212 additions, 98 deletionsdrivers/mmc/card/block.c
- drivers/mmc/card/mmc_test.c 48 additions, 17 deletionsdrivers/mmc/card/mmc_test.c
- drivers/mmc/card/queue.c 4 additions, 4 deletionsdrivers/mmc/card/queue.c
- drivers/mmc/card/sdio_uart.c 5 additions, 5 deletionsdrivers/mmc/card/sdio_uart.c
- drivers/mmc/core/bus.c 3 additions, 3 deletionsdrivers/mmc/core/bus.c
- drivers/mmc/core/core.c 387 additions, 39 deletionsdrivers/mmc/core/core.c
- drivers/mmc/core/core.h 1 addition, 0 deletionsdrivers/mmc/core/core.h
- drivers/mmc/core/debugfs.c 28 additions, 0 deletionsdrivers/mmc/core/debugfs.c
- drivers/mmc/core/host.c 11 additions, 0 deletionsdrivers/mmc/core/host.c
- drivers/mmc/core/mmc.c 264 additions, 23 deletionsdrivers/mmc/core/mmc.c
- drivers/mmc/core/mmc_ops.c 35 additions, 4 deletionsdrivers/mmc/core/mmc_ops.c
Loading
Please register or sign in to comment