From: Linus Torvalds Date: Thu, 1 May 2008 18:15:28 +0000 (-0700) Subject: Merge git://git.infradead.org/mtd-2.6 X-Git-Tag: v2.6.26-rc1~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c4aabcca847ac4c92aa5e960c3f6053e1051b62;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [MTD][NOR] Add physical address to point() method [JFFS2] Track parent inode for directories (for NFS export) [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean. [JFFS2] Quiet lockdep false positive. [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once() [MTD] Delete long-unused jedec.h header file. [MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently. --- 2c4aabcca847ac4c92aa5e960c3f6053e1051b62