tree 0e393eb198a35a90adafcd8129564d0173aafad4
parent 464cf177df7727efcc5506322fc5d0c8b896f545
parent 0477d24e2a87a9077b62298b01b031929f5cf2a2
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1181004849 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1181004849 -0700

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

* git://git.infradead.org/mtd-2.6:
  [JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree()
  [MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions
  [JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes()
  [JFFS2] Fix potential memory leak of dead xattrs on unmount.
  [JFFS2] Fix BUG() caused by failing to discard xattrs on deleted files.
  [MTD] generalise the handling of MTD-specific superblocks
  [MTD] [MAPS] don't force uclinux mtd map to be root dev