Linus Torvalds 489f7ab6c1 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
  trivial: remove the trivial patch monkey's name from SubmittingPatches
  trivial: Fix a typo in comment of addrconf_dad_start()
  trivial: usb: fix missing space typo in doc
  trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
  trivial: Remove the hyphen from git commands
  trivial: fix ETIMEOUT -> ETIMEDOUT typos
  trivial: Kconfig: .ko is normally not included in module names
  trivial: SubmittingPatches: fix typo
  trivial: Documentation/dell_rbu.txt: fix typos
  trivial: Fix Pavel's address in MAINTAINERS
  trivial: ftrace:fix description of trace directory
  trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
  trivial: input/misc: Fix typo in Kconfig
  trivial: fix grammo in bus_for_each_dev() kerneldoc
  trivial: rbtree.txt: fix rb_entry() parameters in sample code
  trivial: spelling fix in ppc code comments
  trivial: fix typo in bio_alloc kernel doc
  trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
  trivial: Miscellaneous documentation typo fixes
  trivial: fix typo milisecond/millisecond for documentation and source comments.
  ...

2009-06-14 13:46:25 -07:00

..

chips

[MTD] [NOR] Fixup for Numonyx M29W128 chips

2009-04-06 07:23:26 -07:00

devices

trivial: Kconfig: .ko is normally not included in module names

2009-06-12 18:01:50 +02:00

lpddr

[MTD] [LPDDR] qinfo_probe depends on lpddr

2009-01-11 10:42:32 +00:00

maps

Merge git://git.infradead.org/mtd-2.6

2009-04-06 14:56:26 -07:00

nand

trivial: Kconfig: .ko is normally not included in module names

2009-06-12 18:01:50 +02:00

onenand

OMAP2/3: PM: push core PM code from linux-omap

2009-05-28 10:58:50 -07:00

tests

trivial: NULL noise: drivers/mtd/tests/mtd_*test.c

2009-03-30 15:22:04 +02:00

ubi

UBI: add fsync capability

2009-02-20 13:34:06 +02:00

afs.c

MTD/JFFS2: remove CVS keywords

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

ar7part.c

[MTD] mtdpart: Make all partition parsers return allocated array

2009-03-20 18:55:17 +00:00

cmdlinepart.c

[MTD] mtdpart: Make all partition parsers return allocated array

2009-03-20 18:55:17 +00:00

ftl.c

[MTD] Remove strange u_int32_t types from FTL

2008-12-10 14:06:42 +00:00

inftlcore.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

inftlmount.c

[MTD] we don't need no misc devices

2009-03-20 13:16:26 +00:00

internal.h

NOMMU: Present backing device capabilities for MTD chardevs

2009-03-24 09:00:19 +00:00

Kconfig

trivial: mtd: fix Kconfig comment about 'armflash'

2009-06-12 18:01:45 +02:00

Makefile

NOMMU: Present backing device capabilities for MTD chardevs

2009-03-24 09:00:19 +00:00

mtd_blkdevs.c

block: Do away with the notion of hardsect_size

2009-05-22 23:22:54 +02:00

mtdbdi.c

NOMMU: Present backing device capabilities for MTD chardevs

2009-03-24 09:00:19 +00: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] driver model updates

2009-04-04 14:29:07 +01:00

mtdconcat.c

NOMMU: Add support for direct mapping through mtdconcat if possible

2009-03-24 09:01:08 +00:00

mtdcore.c

mtd: expose subpage size via sysfs

2009-04-19 09:12:49 +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: fix a bit of spin lock usage

2009-03-20 18:39:25 +00:00

mtdpart.c

[MTD] mtdpart: Make ecc_stats more realistic.

2009-04-06 07:22:28 -07:00

mtdsuper.c

Convert obvious places to deactivate_locked_super()

2009-05-09 10:49:40 -04:00

nftlcore.c

[MTD] Auto-load nftl module when device opened.

2009-03-20 18:34:00 +00:00

nftlmount.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

ofpart.c

[MTD] ofpart: Check name property to determine partition nodes.

2009-03-24 14:04:20 +00: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] remove private wrapper of endian helpers in rfd_ftl.c

2008-12-10 15:39:09 +00:00

ssfdc.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00