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
..
altera-stapl
c2port
carma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
cb710
eeprom
ibmasm
iwmc3200top	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
lis3lv02d	module_param: check type correctness for module_param_array	2012-01-13 09:32:16 +10:30
sgi-gru	switch procfs to umode_t use	2012-01-03 22:54:56 -05:00
sgi-xp
ti-st	drivers:misc: ti-st: DEBUG uart, baud rate mods	2012-01-04 15:21:04 -08:00
ab8500-pwm.c	mfd: Unify abx500 headers in mfd/abx500	2012-01-09 00:37:39 +01:00
ad525x_dpot-i2c.c
ad525x_dpot-spi.c
ad525x_dpot.c
ad525x_dpot.h	Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc	2012-01-09 12:08:59 -08:00
apds990x.c
apds9802als.c
arm-charlcd.c
atmel_pwm.c
atmel_tclib.c
atmel-ssc.c
bh1770glc.c
bh1780gli.c
bmp085.c	BMP085: Remove redundant semi-colon from return statement	2012-01-04 15:21:56 -08:00
cs5535-mfgpt.c
ds1682.c
enclosure.c
ep93xx_pwm.c
fsa9480.c
hmc6352.c
hpilo.c
hpilo.h
ics932s401.c
ioc4.c
isl29003.c
isl29020.c	isl29020: Remove a redundant semi-colon from return statement	2012-01-04 15:21:56 -08:00
Kconfig	misc: Add driver support for MAX8997 MUIC	2012-01-09 00:37:32 +01:00
kgdbts.c
lkdtm.c
Makefile	misc: Add driver support for MAX8997 MUIC	2012-01-09 00:37:32 +01:00
max8997-muic.c	misc: Remove max8997-muic sysfs attributes	2012-01-09 00:37:42 +01:00
pch_phub.c
phantom.c
pti.c
spear13xx_pcie_gadget.c
ti_dac7512.c
tifm_7xx1.c
tifm_core.c
tsl2550.c
vmw_balloon.c