linux/drivers/mtd/nand
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
..
bcm47xxnflash A small set of simple regression and build fixes for 3.8: 2013-02-05 07:54:11 +11:00
gpmi-nand Drivers: mtd: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
alauda.c
ams-delta.c
atmel_nand_ecc.h
atmel_nand.c Drivers: mtd: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
au1550nd.c
bf5xx_nand.c
cafe_nand.c
cmx270_nand.c
cs553x_nand.c
davinci_nand.c mtd: davinci_nand: fix modular build with CONFIG_OF=y 2013-01-11 16:53:24 +00:00
denali_dt.c
denali_pci.c
denali.c
denali.h
diskonchip.c
docg4.c
fsl_elbc_nand.c
fsl_ifc_nand.c
fsl_upm.c Drivers: mtd: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
fsmc_nand.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2013-02-26 09:24:48 -08:00
gpio.c
h1910.c
jz4740_nand.c Drivers: mtd: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
Kconfig drivers/mtd/nand: remove depends on CONFIG_EXPERIMENTAL 2013-01-11 11:38:07 -08:00
lpc32xx_mlc.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
lpc32xx_slc.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
Makefile
mpc5121_nfc.c
mxc_nand.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
nand_base.c mtd: nand: onfi don't WARN if we are in 16 bits mode 2013-01-19 09:58:33 +00:00
nand_bbt.c
nand_bch.c
nand_ecc.c
nand_ids.c
nandsim.c
ndfc.c
nuc900_nand.c
omap2.c mtd: omap-nand: pass device_node in platform data 2013-01-14 09:55:19 -08:00
orion_nand.c
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c
r852.c
r852.h
rtc_from4.c
s3c2410.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c
tmio_nand.c
txx9ndfmc.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
xway_nand.c