1
linux/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
ams-delta.c
atmel_nand_ecc.h
atmel_nand.c
au1550nd.c
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c
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
cs553x_nand.c
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
diskonchip.c
edb7312.c
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
h1910.c
jz4740_nand.c
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
nand_bcm_umi.h
nand_ecc.c
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
nuc900_nand.c
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
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
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
s3c2410.c
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c
spia.c
tmio_nand.c
txx9ndfmc.c