FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 13:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60d9aa758c
linux/drivers/mtd/nand
History
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -08:00
..
alauda.c mtd: alauda: Use hweight8 2009-11-30 09:53:19 +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: error return -EIO instead of EIO 2009-11-30 09:51:44 +00:00
au1550nd.c [MTD] [NAND] au1550nd.c: remove unused #include <version.h> 2008-08-25 12:20:53 +01: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 mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
bf5xx_nand.c mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs 2009-06-05 18:27:43 +01:00
cafe_nand.c Merge git://git.infradead.org/mtd-2.6 2009-09-23 10:07:49 -07:00
cmx270_nand.c trivial: mtd: add __init/__exit macros to init/exitfunctions 2009-09-21 15:14:53 +02: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 mtd: Add bad block table overrides to Davinci NAND driver 2009-11-30 11:31:09 +00:00
diskonchip.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
edb7312.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
excite_nandflash.c mtd: move excite_nand_remove to .devexit.text 2009-11-30 10:01:40 +00:00
fsl_elbc_nand.c mtd: eLBC NAND: give more verbose output on error 2009-11-30 09:53:55 +00:00
fsl_upm.c mtd: ensure index is positive 2009-11-30 09:50:46 +00:00
gpio.c [MTD] [NAND] GPIO NAND flash driver 2008-10-18 12:48:42 +01:00
h1910.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
Kconfig Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
Makefile mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
mxc_nand.c Revert "mtd: move mxcnd_remove to .exit.text" 2009-12-07 09:44:05 +00:00
nand_base.c mtd: nand: fix multi-chip suspend problem 2009-11-30 11:41:24 +00:00
nand_bbt.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
nand_bcm_umi.c mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
nand_bcm_umi.h mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
nand_ecc.c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
nand_ids.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
nandsim.c mtd: nandsim: add support for 4KiB pages 2009-12-01 14:51:45 +00:00
ndfc.c mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver 2009-09-19 14:15:00 -07:00
nomadik_nand.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
omap2.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
orion_nand.c mtd: nand: register orion_nand using platform_driver_probe() 2009-09-19 11:06:30 -07:00
pasemi_nand.c powerpc: More printing warning fixes for the l64 to ll64 conversion 2009-01-28 17:15:52 +11:00
plat_nand.c mtd: plat_nand: request memory resource before doing ioremap 2009-10-20 09:09:59 +09:00
ppchameleonevb.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
pxa3xx_nand.c pxa3xx_nand: move pxa3xx_nand.h common into plat directory 2009-12-01 09:02:43 +08:00
rtc_from4.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
s3c2410.c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
sh_flctl.c mtd: sh_flctl: register sh_flctl using platform_driver_probe() 2009-09-19 16:07:34 -07:00
sharpsl.c [MTD] sharpsl-nand: move registration to board code 2008-10-29 21:08:37 +03:00
socrates_nand.c [MTD] [NAND] Add support for NAND on the Socrates board 2009-04-06 07:15:27 -07:00
spia.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
tmio_nand.c mtd: nand: fix tmio_nand ecc correction 2009-09-19 14:20:33 -07:00
ts7250.c mtd: ep93xx: cleanup includes in ts7250 nand driver 2009-09-04 09:35:12 +01:00
txx9ndfmc.c mtd: txx9ndfmc: Use nand_release to free resources 2009-11-30 09:47:42 +00:00
w90p910_nand.c mtd: add nand support for w90p910 (v2) 2009-09-19 13:17:05 -07:00