From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Jun 2010 00:10:06 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/mtd-2.6.35
X-Git-Tag: cont_sys_log_2~16
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=3975d16760d4be7402d1067c548c30c427971331

Merge git://git.infradead.org/~dwmw2/mtd-2.6.35

* git://git.infradead.org/~dwmw2/mtd-2.6.35:
  jffs2: update ctime when changing the file's permission by setfacl
  jffs2: Fix NFS race by using insert_inode_locked()
  jffs2: Fix in-core inode leaks on error paths
  mtd: Fix NAND submenu
  mtd/r852: update card detect early.
  mtd/r852: Fixes in case of DMA timeout
  mtd/r852: register IRQ as last step
  drivers/mtd: Use memdup_user
  docbook: make mtd nand module init static
---

3975d16760d4be7402d1067c548c30c427971331