| commit | 3975d16760d4be7402d1067c548c30c427971331 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 07 17:10:06 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 07 17:10:06 2010 -0700 |
| tree | 4fa12ee1e8aabf1352307455163dabe293ed4874 | |
| parent | 4d3d769c605ebdf9fbb5a9d63827598b48351861 [diff] | |
| parent | 1c24d06f8e065023ebb428db5af5514500839ee6 [diff] |
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