tree 756481631c3375d6a1b07233013efa12d8aa3725
parent bcf35afb528109a31264b45d4851fa6ae72dbe18
parent a98889f3d8882995b5aa2255b931cf0202325cc0
author Linus Torvalds <torvalds@linux-foundation.org> 1209665728 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209665728 -0700

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.