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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-11 14:36:25 +01:00

ubi

UBI: always start the background thread

2008-07-25 11:35:15 +03:00

afs.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

ar7part.c

[MTD] Clean up AR7 partition map support

2008-04-23 09:39:49 +01:00

cmdlinepart.c

[MTD] Fix const assignment in the MTD command line partitioning driver

2008-07-11 18:24:38 +01:00

ftl.c

Support 'discard sectors' operation.

2008-10-09 08:56:01 +02:00

inftlcore.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

inftlmount.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

Kconfig

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

Makefile

[MTD] AR7 mtd partition map

2008-04-22 20:48:12 +01:00

mtd_blkdevs.c

Support 'discard sectors' operation in translation layer support core

2008-10-09 08:56:01 +02:00

mtdblock_ro.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

mtdblock.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

mtdchar.c

[MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl()

2008-09-02 09:29:05 +01:00

mtdconcat.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

mtdcore.c

[MTD] Use list_for_each_entry[_safe] where appropriate.

2008-06-04 17:53:31 +01:00

mtdcore.h

[MTD] mtdcore.c: share syms with mtd_blkdev.c

2007-06-28 20:24:50 +01:00

mtdoops.c

[MTD] mtdoops.c: make struct oops_cxt static again

2008-04-22 12:35:34 +01:00

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

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

nftlmount.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

ofpart.c

[MTD] mtd/ofpart.c: add MODULE_LICENSE

2008-04-22 15:53:52 +01:00

redboot.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-11 14:36:25 +01:00

rfd_ftl.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

ssfdc.c

[MTD] Fix ssfdc blksize typo

2006-12-11 09:43:38 +00:00