kernel-fxtec-pro1x/drivers/mmc/host
Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.
2012-01-17 18:40:24 -08:00
..
at91_mci.c
at91_mci.h
atmel-mci-regs.h
atmel-mci.c
au1xmmc.c
bfin_sdh.c
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c
dw_mmc.c
dw_mmc.h
imxmmc.c
imxmmc.h
jz4740_mmc.c
Kconfig
Makefile
mmc_spi.c
mmci.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
mmci.h
msm_sdcc.c
msm_sdcc.h
mvsdio.c
mvsdio.h
mxcmmc.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
mxs-mmc.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
of_mmc_spi.c
omap.c
omap_hsmmc.c
pxamci.c
pxamci.h
s3cmci.c
s3cmci.h
sdhci-cns3xxx.c
sdhci-dove.c
sdhci-esdhc-imx.c
sdhci-esdhc.h
sdhci-of-esdhc.c
sdhci-of-hlwd.c
sdhci-pci-data.c
sdhci-pci.c
sdhci-pltfm.c
sdhci-pltfm.h
sdhci-pxav2.c
sdhci-pxav3.c
sdhci-s3c.c
sdhci-spear.c
sdhci-tegra.c
sdhci.c
sdhci.h
sdricoh_cs.c
sh_mmcif.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
sh_mobile_sdhi.c
tifm_sd.c
tmio_mmc.c
tmio_mmc.h
tmio_mmc_dma.c
tmio_mmc_pio.c
ushc.c
via-sdmmc.c
vub300.c
wbsd.c
wbsd.h