2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 04:03:58 +08:00
linux-next/drivers/mtd/nand
Linus Torvalds 79346507ad Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (82 commits)
  mtd: fix build error in m25p80.c
  mtd: Remove redundant mutex from mtd_blkdevs.c
  MTD: Fix wrong check register_blkdev return value
  Revert "mtd: cleanup Kconfig dependencies"
  mtd: cfi_cmdset_0002: make sector erase command variable
  mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
  mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
  mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
  block2mtd: dubious assignment
  P4080/mtd: Fix the freescale lbc issue with 36bit mode
  P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
  mtd: phram: use KBUILD_MODNAME
  mtd: OneNAND: S5PC110: Fix double call suspend & resume function
  mtd: nand: fix MTD_MODE_RAW writes
  jffs2: use kmemdup
  mtd: sm_ftl: cosmetic, use bool when possible
  mtd: r852: remove useless pci powerup/down from suspend/resume routines
  mtd: blktrans: fix a race vs kthread_stop
  mtd: blktrans: kill BKL
  mtd: allow to unload the mtdtrans module if its block devices aren't open
  ...

Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
2010-10-30 08:31:35 -07:00
..
alauda.c mtd: nand: make USB device id constant 2010-02-25 11:26:31 +00:00
ams-delta.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
atmel_nand_ecc.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
atmel_nand.c mtd: atmel_nand: fix warning: 'part_probes' defined but not used 2010-08-06 09:22:22 +01:00
au1550nd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-03-26 14:55:59 +00:00
autcpu12.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
bcm_umi_bch.c mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
bcm_umi_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
bf5xx_nand.c mtd: Blackfin NFC: fix badblock location with BootROM OOB 2010-10-25 01:15:22 +01:00
cafe_nand.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
cmx270_nand.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
cs553x_nand.c [MTD] [NAND] Fix compilation warnings in drivers/mtd/nand/cs553x_nand.c 2008-10-18 12:39:17 +01:00
davinci_nand.c Merge git://git.infradead.org/mtd-2.6 2010-10-30 08:31:35 -07:00
denali.c mtd: nand: denali should also handle NAND_CMD_PARAM 2010-10-24 23:45:05 +01:00
denali.h nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk 2010-08-11 00:28:40 +01:00
diskonchip.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
edb7312.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
fsl_elbc_nand.c P4080/mtd: Fix the freescale lbc issue with 36bit mode 2010-10-25 15:41:04 +01:00
fsl_upm.c mtd: Fix endianness issues from device tree 2010-10-25 00:55:56 +01:00
fsmc_nand.c mtd: generic FSMC NAND MTD driver 2010-10-25 00:33:48 +01:00
gpio.c mtd: drivers/mtd/nand/gpio.c: use resource_size() 2009-12-31 20:47:01 +00:00
h1910.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
jz4740_nand.c MTD: Nand: Add JZ4740 NAND driver 2010-08-05 13:26:18 +01:00
Kconfig P4080/eLBC: Make Freescale elbc interrupt common to elbc devices 2010-10-25 15:40:54 +01:00
Makefile mtd: generic FSMC NAND MTD driver 2010-10-25 00:33:48 +01:00
mpc5121_nfc.c mtd: Fix endianness issues from device tree 2010-10-25 00:55:56 +01:00
mxc_nand.c mxc_nand: do not depend on disabling the irq in the interrupt handler 2010-10-18 13:09:05 -07:00
nand_base.c mtd: nand: fix MTD_MODE_RAW writes 2010-10-25 01:33:37 +01:00
nand_bbt.c mtd: nand: introduce NAND_CREATE_EMPTY_BBT 2010-10-25 00:54:37 +01:00
nand_bcm_umi.c mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
nand_bcm_umi.h mtd: nand_bcm: fix hot spin and code duplication 2010-02-26 16:56:35 +00:00
nand_ecc.c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
nand_ids.c mtd: nand: support new Toshiba SLC 2010-10-24 23:38:30 +01:00
nandsim.c mtd: nandsim: add module param for BBT handling 2010-10-25 00:55:03 +01:00
ndfc.c mtd: Fix endianness issues from device tree 2010-10-25 00:55:56 +01:00
nomadik_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
nuc900_nand.c mtd: nand: rename w90p910_nand.c to nuc900_nand.c 2010-01-01 12:16:47 +00:00
omap2.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2010-10-30 12:35:11 +01:00
orion_nand.c mtd: orion/kirkwood: add RnB line support to orion mtd driver 2010-05-14 01:04:19 +01:00
pasemi_nand.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
plat_nand.c gen_nand: Test if nr_chips field is valid 2010-08-12 12:17:36 +01:00
ppchameleonevb.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
pxa3xx_nand.c mtd: pxa3xx_nand: set oob length in the runtime 2010-10-24 23:39:41 +01:00
r852.c mtd: r852: remove useless pci powerup/down from suspend/resume routines 2010-10-25 01:32:21 +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: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
s3c2410.c mtd: s3c nand: parsing command-line partitions prior to set->partitions 2010-08-02 09:08:13 +01:00
sh_flctl.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
sharpsl.c [MTD] sharpsl-nand: move registration to board code 2008-10-29 21:08:37 +03:00
sm_common.c mtd: sm_common: remove casts from void 2010-08-02 09:06:10 +01:00
sm_common.h mtd: sm_common: split smartmedia and xD table 2010-05-14 01:03:46 +01:00
socrates_nand.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
spia.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
tmio_nand.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
txx9ndfmc.c mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident() 2010-02-26 18:32:56 +00:00