You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
chips	…
devices	…
maps	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	16 years ago
nand	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	16 years ago
onenand	…
ubi	…
Kconfig	…
Makefile	…
afs.c	…
ar7part.c	…
cmdlinepart.c	…
ftl.c	Support 'discard sectors' operation.	16 years ago
inftlcore.c	…
inftlmount.c	…
mtd_blkdevs.c	Support 'discard sectors' operation in translation layer support core	16 years ago
mtdblock.c	…
mtdblock_ro.c	…
mtdchar.c	[MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl()	17 years ago
mtdconcat.c	…
mtdcore.c	…
mtdcore.h	…
mtdoops.c	…
mtdpart.c	…
mtdsuper.c	…
nftlcore.c	…
nftlmount.c	…
ofpart.c	…
redboot.c	…
rfd_ftl.c	…
ssfdc.c	…