Linus Torvalds 2be4ff2f08 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: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
chips	[MTD] [NOR] drivers/mtd/chips/jedec_probe.c: fix Am29DL800BB device ID	2008-07-31 08:34:46 +01:00
devices	[MTD] DataFlash: bugfix, binary page sizes now handled	2008-07-30 14:20:32 +01:00
maps	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
nand	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
onenand
ubi	UBI: always start the background thread	2008-07-25 11:35:15 +03:00
afs.c
ar7part.c
cmdlinepart.c
ftl.c	Support 'discard sectors' operation.	2008-10-09 08:56:01 +02:00
inftlcore.c
inftlmount.c
Kconfig
Makefile
mtd_blkdevs.c	Support 'discard sectors' operation in translation layer support core	2008-10-09 08:56:01 +02:00
mtdblock_ro.c
mtdblock.c
mtdchar.c	[MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl()	2008-09-02 09:29:05 +01:00
mtdconcat.c
mtdcore.c
mtdcore.h
mtdoops.c
mtdpart.c	[MTD][MTDPART] Fix a division by zero bug	2008-07-25 10:00:11 -04:00
mtdsuper.c	[MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c	2008-08-02 07:52:39 +01:00
nftlcore.c
nftlmount.c
ofpart.c
redboot.c
rfd_ftl.c
ssfdc.c