linux-hardened/drivers/misc
Linus Torvalds 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...
2013-02-26 09:24:48 -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 char/misc: remove CONFIG_EXPERIMENTAL dependencies 2012-09-18 16:14:53 +01:00
carma dmaengine: remove dma_async_memcpy_pending() macro 2013-01-07 22:05:09 -08:00
cb710 drivers/misc/cb710: add missing GENERIC_HARDIRQS dependency 2013-02-08 12:23:53 -08:00
eeprom misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
ibmasm misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
lis3lv02d misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
mei mei: fix undefined wd symbols when MEI_ME is not set 2013-02-07 14:00:25 -08:00
sgi-gru x86, uv, uv3: Check current gru hub support for SGI UV3 2013-02-11 17:18:19 -08:00
sgi-xp SGI-XP: handle non-fatal traps 2012-12-20 17:40:20 -08:00
ti-st Char/Misc driver patches for 3.9-rc1 2013-02-21 13:57:13 -08:00
vmw_vmci drivers, vmci: Fix build error 2013-01-25 12:22:46 -08:00
ad525x_dpot-i2c.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
ad525x_dpot-spi.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
ad525x_dpot.c misc: remove use of __devinit 2012-11-21 12:51:53 -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 misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
apds9802als.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
arm-charlcd.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
atmel-ssc.c Driver core patches for 3.9-rc1 2013-02-21 12:05:51 -08: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 ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter 2012-03-01 13:38:49 +01:00
bh1770glc.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
bh1780gli.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
bmp085-i2c.c misc: remove use of __devinit 2012-11-21 12:51:53 -08:00
bmp085-spi.c misc: remove use of __devinit 2012-11-21 12:51:53 -08:00
bmp085.c misc: remove use of __devinit 2012-11-21 12:51:53 -08:00
bmp085.h misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
cs5535-mfgpt.c misc: remove use of __devinit 2012-11-21 12:51:53 -08:00
ds1682.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
enclosure.c [SCSI] enclosure: fix error path - actually return ERR_PTR() on error 2010-07-27 12:03:48 -05:00
ep93xx_pwm.c drivers/misc/ep93xx_pwm.c: world-writable sysfs files 2011-03-22 17:44:11 -07:00
fsa9480.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
hmc6352.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
hpilo.c misc: remove use of __devinit 2012-11-21 12:51:53 -08:00
hpilo.h misc: hpilo: increase number of max supported channels 2012-06-14 17:22:12 -07:00
ics932s401.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
ioc4.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
isl29003.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
isl29020.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
Kconfig Char/Misc driver patches for 3.9-rc1 2013-02-21 13:57:13 -08:00
kgdbts.c x86,kgdb: Fix DEBUG_RODATA limitation using text_poke() 2012-03-29 17:41:25 -05:00
lattice-ecp3-config.c misc: lattice-ecp3-config.c: remove __dev* markings 2013-01-17 10:25:26 -08:00
lkdtm.c drivers/misc/lkdtm.c: fix missing allocation failure check 2012-07-30 17:25:22 -07:00
Makefile misc: Add Lattice ECP3 FPGA configuration via SPI 2013-01-17 10:25:03 -08:00
pch_phub.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
phantom.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
pti.c TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
spear13xx_pcie_gadget.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
ti_dac7512.c misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
tifm_7xx1.c tifm: use module_pci_driver 2012-09-05 14:10:29 -07: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 misc: remove use of __devexit 2012-11-21 12:53:32 -08:00
vmw_balloon.c vmw_balloon: fix for a -Wuninitialized warning 2012-02-02 16:28:13 -08:00