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

..

Kconfig

2nd set of device tree changes for v3.3

2012-01-14 13:25:55 -08:00

Makefile

spi: remove obsolete spi-s3c24xx-gpio driver

2011-07-04 10:52:58 -06:00

spi-altera.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-ath79.c

spi/ath79: fix compile error due to missing include

2011-12-07 21:57:49 +01:00

spi-atmel.c

atmel/spi: fix missing probe

2011-11-09 23:02:12 +08:00

spi-au1550.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-bfin5xx.c

spi: irq: Remove IRQF_DISABLED

2011-10-24 14:14:40 +02:00

spi-bfin-sport.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-bitbang-txrx.h

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-bitbang.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-butterfly.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-coldfire-qspi.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-davinci.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-dw-mid.c

Merge branch 'dma_slave_direction' into next_test_dirn

2011-11-17 14:54:57 +05:30

spi-dw-mmio.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-dw-pci.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-dw.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-dw.h

spi: spi-dw: fix all sparse warnings

2011-09-21 09:41:48 -06:00

spi-ep93xx.c

Merge branch 'dma_slave_direction' into next_test_dirn

2011-11-17 14:54:57 +05:30

spi-fsl-espi.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-fsl-lib.c

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-fsl-lib.h

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-fsl-spi.c

spi: Fix WARN when removing spi-fsl-spi module

2011-09-23 17:28:29 -06:00

spi-gpio.c

spi/gpio: fix section mismatch warning

2011-12-07 22:17:39 +01:00

spi-imx.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-lm70llp.c

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-mpc52xx-psc.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-mpc52xx.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-mpc512x-psc.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-nuc900.c

spi/nuc900: Include linux/module.h

2011-12-07 21:58:12 +01:00

spi-oc-tiny.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-omap2-mcspi.c

spi/omap: Correct the error path

2011-10-29 14:07:18 +02:00

spi-omap-100k.c

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-omap-uwire.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-orion.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-pl022.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

spi-ppc4xx.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-pxa2xx-pci.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-pxa2xx.c

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-s3c24xx-fiq.h

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-s3c24xx-fiq.S

spi: reorganize drivers

2011-06-06 01:16:30 -06:00

spi-s3c24xx.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-s3c64xx.c

spi/s3c64xx: Use bus clocks created using clkdev

2011-12-23 10:10:21 +09:00

spi-sh-msiof.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-sh-sci.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-sh.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-stmp.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-tegra.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi-ti-ssp.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-tle62x0.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-topcliff-pch.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

spi-txx9.c

spi: Add module.h to implicit users in drivers/spi

2011-10-31 19:32:17 -04:00

spi-xilinx.c

drivercore: Add helper macro for platform_driver boilerplate

2011-10-25 00:35:47 +02:00

spi.c

spi: Fix device unregistration when unregistering the bus master

2011-12-13 16:45:35 -07:00

spidev.c

spi: reorganize drivers

2011-06-06 01:16:30 -06:00