linux/drivers/mtd
Linus Torvalds 1685e633b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
2010-08-06 12:25:06 -07:00
..
chips mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips 2010-05-20 16:57:00 +01:00
devices mtd: sst25l: fix multi-part messages with broken spi masters 2010-05-14 01:52:24 +01:00
lpddr drivers/mtd: Use kzalloc 2010-05-13 21:23:06 +01:00
maps Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2010-08-06 12:25:06 -07:00
nand Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 2010-08-05 08:53:20 -07:00
onenand mtd: add Samsung SoC OneNAND driver 2010-05-14 01:51:20 +01:00
tests drivers/mtd: Use kzalloc 2010-05-13 21:23:06 +01:00
ubi UBI: do not warn unnecessarily 2010-08-02 07:21:19 +03:00
afs.c
ar7part.c
cmdlinepart.c
ftl.c
inftlcore.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
inftlmount.c
Kconfig mtd: sm_ftl: remove CONFIG_SM_FTL_MUSEUM and make it always on 2010-03-26 15:28:59 +00:00
Makefile 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
mtd_blkdevs.c mtd: blktrans: do blk_cleanup_queue when it is really safe to do so 2010-03-08 18:57:42 -08:00
mtdblock_ro.c
mtdblock.c
mtdchar.c Merge git://git.infradead.org/~dwmw2/mtd-2.6.35 2010-06-07 17:10:06 -07:00
mtdconcat.c drivers/mtd: Use kmemdup 2010-05-15 23:07:01 +01:00
mtdcore.c mtd: update gfp/slab.h includes 2010-05-19 17:21:52 +01:00
mtdcore.h
mtdoops.c
mtdpart.c
mtdsuper.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
nftlcore.c
nftlmount.c
ofpart.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
redboot.c
rfd_ftl.c
sm_ftl.c bitops: rename for_each_bit() to for_each_set_bit(): mtd 2010-04-08 09:42:41 +01:00
sm_ftl.h
ssfdc.c