diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-05 09:13:06 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-05 09:13:06 +0900 |
| commit | 844ce9f2044723a9da0f4bce588cca410e774d24 (patch) | |
| tree | 406626ba6728fd231eb1d9b611acd949cf232048 /fs/gfs2/lops.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
| parent | mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case (diff) | |
| download | linux-dev-844ce9f2044723a9da0f4bce588cca410e774d24.tar.xz linux-dev-844ce9f2044723a9da0f4bce588cca410e774d24.zip | |
Merge tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Pull MMC fixes from Chris Ball:
- sdhci-acpi: Fix initial runtime PM status, add more ACPI IDs
- atmel-mci, omap_hsmmc: DT handling fixes
- esdhc-imx: Fix SDIO IRQs, fix multiblock reads (both h/w errata)
* tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case
mmc: omap_hsmmc: convert to dma_request_slave_channel_compat
mmc: omap_hsmmc: Fix the DT pbias workaround for MMC controllers 2 to 5
mmc: sdhci-pci: add more device ids
mmc: sdhci-acpi: add more device ids
mmc: sdhci-acpi: fix initial runtime pm status
mmc: atmel-mci: convert to dma_request_slave_channel_compat()
mmc: sdhci-esdhc-imx: fix multiblock reads on i.MX53
mmc: sdhci-esdhc-imx: Fix SDIO interrupts
Diffstat (limited to 'fs/gfs2/lops.c')
0 files changed, 0 insertions, 0 deletions