kernel-fxtec-pro1x/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 mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN 2012-05-13 23:14:23 -05:00
ams-delta.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
atmel_nand.c Drivers: mtd: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
atmel_nand_ecc.h mtd: at91: atmel_nand: add Programmable Multibit ECC controller support 2012-07-06 18:23:25 +01:00
au1550nd.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
bf5xx_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
cafe_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
cmx270_nand.c mtd: kill MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:46 +01:00
cs553x_nand.c mtd cs553x_nand: Initialise ecc.strength before nand_scan() 2012-12-03 16:36:34 +02:00
davinci_nand.c mtd: davinci_nand: fix modular build with CONFIG_OF=y 2013-01-11 16:53:24 +00:00
denali.c mtd: denali: split the generic driver and PCI layer 2012-11-15 15:37:46 +02:00
denali.h mtd: denali: add a DT driver 2012-11-15 15:37:46 +02:00
denali_dt.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
denali_pci.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
diskonchip.c mtd: diskonchip: don't warn about ARM architecture 2012-11-16 10:57:38 +02:00
docg4.c mtd: nand/docg4: fix and improve read of factory bbt 2012-12-12 17:03:42 +02:00
fsl_elbc_nand.c mtd: remove use of __devinit 2012-11-22 12:07:03 +02:00
fsl_ifc_nand.c mtd: remove use of __devinit 2012-11-22 12:07:03 +02:00
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 mtd: nand/gpio: use io{read,write}*_rep accessors 2012-12-13 13:39:44 +02:00
h1910.c - More robust parsing especially of xattr data in JFFS2 2012-06-01 16:55:42 -07:00
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 MTD pull for 3.8 2012-12-19 12:47:41 -08:00
mpc5121_nfc.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
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 mtd: nand: use NAND_BBT_SCAN_MAXBLOCKS 2012-09-29 15:54:10 +01:00
nand_bch.c mtd: cleanup style on pr_debug messages 2011-09-11 15:02:16 +03:00
nand_ecc.c mtd: spelling, capitalization, uniformity 2011-09-11 15:02:13 +03:00
nand_ids.c mtd: nand: change "AMD" manuf. ID to "AMD/Spansion" 2012-07-06 18:17:08 +01:00
nandsim.c MTD pull for 3.8 2012-12-19 12:47:41 -08:00
ndfc.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
nuc900_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
omap2.c mtd: omap-nand: pass device_node in platform data 2013-01-14 09:55:19 -08:00
orion_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
pasemi_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
plat_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
ppchameleonevb.c mtd: do not use plain 0 as NULL 2012-03-27 00:53:20 +01:00
pxa3xx_nand.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
r852.c mtd: kill MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:46 +01:00
r852.h mtd: r852: remove useless pci powerup/down from suspend/resume routines 2010-10-25 01:32:21 +01:00
rtc_from4.c mtd: flash drivers set ecc strength 2012-03-27 00:56:46 +01:00
s3c2410.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
sh_flctl.c MTD pull for 3.8 2012-12-19 12:47:41 -08:00
sharpsl.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
sm_common.c mtd: nand: kill NAND_NO_AUTOINCR option 2012-05-13 23:15:38 -05:00
sm_common.h mtd: sm_common: split smartmedia and xD table 2010-05-14 01:03:46 +01:00
socrates_nand.c mtd: remove use of __devexit 2012-11-22 12:07:03 +02:00
tmio_nand.c mtd: kill MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:46 +01:00
txx9ndfmc.c mtd: Convert to devm_ioremap_resource() 2013-01-25 12:21:47 -08:00
xway_nand.c mtd: lantiq: Add NAND support on Lantiq XWAY SoC. 2012-09-29 15:05:18 +01:00