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
..
devices	Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:16:43 -07:00
include/mach	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
3ds_debugboard.c
audmux-v1.c
audmux-v2.c
avic.c	ARM:i.MX: fix build error in tzic/avic.c	2011-11-04 03:54:17 +08:00
clock.c
cpu.c
cpufreq.c	arm/imx: fix cpufreq section mismatch	2011-12-19 12:26:05 +01:00
devices.c	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
epit.c
iomux-v1.c
iomux-v3.c
iram_alloc.c
irq-common.c
irq-common.h
Kconfig	ARM: l2x0/pl310: Refactor Kconfig to be more maintainable	2011-12-19 13:46:11 +00:00
Makefile	ARM: imx: convert smp platforms to global gic_handle_irq()	2011-11-15 18:13:59 +00:00
pwm.c	ARM:imx:fix pwm period value	2011-12-19 12:25:35 +01:00
ssi-fiq-ksym.c
ssi-fiq.S
system.c	ARM: restart: mxc: use new restart hook	2012-01-05 12:57:15 +00:00
time.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00
tzic.c	ARM: mx5: use generic irq chip pm interface for pm functions on	2011-12-25 12:02:28 +08:00
ulpi.c