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	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2011-10-31 15:42:54 -07:00
c2port	Fix common misspellings	2011-03-31 11:26:23 -03:00
carma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
cb710	mmc: cb710: fix possible pci_dev leak in cb710_pci_configure()	2011-08-13 14:50:23 -04:00
eeprom	eeprom_93cx6: Add write support	2011-11-26 14:59:39 -05:00
ibmasm	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
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	net: remove NETIF_F_NO_CSUM feature bit	2011-11-16 17:43:12 -05:00
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	misc: ad525x_dpot: Add support for SPI module device table matching	2011-11-18 11:27:02 -08:00
ad525x_dpot-spi.c	misc: ad525x_dpot: Add support for SPI module device table matching	2011-11-18 11:27:02 -08:00
ad525x_dpot.c	misc: ad525x_dpot: Add support for SPI module device table matching	2011-11-18 11:27:02 -08:00
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	drivers/misc/apds990x.c: apds990x_chip_on() should depend on CONFIG_PM || CONFIG_PM_RUNTIME	2011-06-15 20:04:02 -07:00
apds9802als.c	drivers/misc/apds9802als.c: put the device into runtime suspend after resume()/probe() is handled	2011-03-22 17:44:10 -07:00
arm-charlcd.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
atmel_pwm.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
atmel_tclib.c	drivers/misc: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required.	2011-10-31 19:31:54 -04:00
atmel-ssc.c	drivers/misc: Add module.h to files who are really modular.	2011-10-31 19:31:53 -04:00
bh1770glc.c	drivers/misc/bh1770glc.c: error handling in bh1770_power_state_store()	2010-11-12 07:55:31 -08:00
bh1780gli.c	drivers/misc: Add module.h to files who are really modular.	2011-10-31 19:31:53 -04:00
bmp085.c	BMP085: Remove redundant semi-colon from return statement	2012-01-04 15:21:56 -08:00
cs5535-mfgpt.c	drivers/misc/cs5535-mfgpt.c: fix wrong if condition	2011-06-15 20:04:00 -07:00
ds1682.c
enclosure.c
ep93xx_pwm.c	drivers/misc/ep93xx_pwm.c: world-writable sysfs files	2011-03-22 17:44:11 -07:00
fsa9480.c	driver/misc/fsa9480.c fix potential null-pointer dereference	2011-10-31 17:30:53 -07:00
hmc6352.c	drivers/misc/hmc6352.c: fix wrong return value checking for i2c_master_recv()	2011-03-22 17:44:10 -07:00
hpilo.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2010-10-22 19:36:42 -07:00
hpilo.h
ics932s401.c
ioc4.c	drivers/misc/ioc4.c: fix section mismatch / race condition	2011-06-27 18:00:13 -07:00
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	drivers/misc: Add module.h to files who are really modular.	2011-10-31 19:31:53 -04:00
lkdtm.c	drivers/misc/lkdtm.c: fix race when crashpoint is hit multiple times before checking count	2011-06-27 18:00:13 -07:00
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	pch_phub: Fix MAC address writing issue for LAPIS ML7831	2011-11-15 11:01:50 -08:00
phantom.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
pti.c	drivers/misc/pti.c: give 'comm' function scope in pti_control_frame_built_and_sent()	2011-09-14 18:09:38 -07:00
spear13xx_pcie_gadget.c	pcie-gadget-spear: Add "platform:" prefix for platform modalias	2011-11-14 16:09:32 -08:00
ti_dac7512.c
tifm_7xx1.c	drivers/misc: Add module.h to files who are really modular.	2011-10-31 19:31:53 -04:00
tifm_core.c	drivers/misc: Add module.h to files who are really modular.	2011-10-31 19:31:53 -04:00
tsl2550.c
vmw_balloon.c	drivers/misc/vmw_balloon.c: fix typo in code comment	2011-11-02 16:07:03 -07:00