tree f77313df6358700d58cc7921551400170a8f6700
parent d49981150387c481779a544ec641f17882f4bbfb
parent b50be33e42e2c87812b30aee1a2b2a5ac6cb3ffa
author Linus Torvalds <torvalds@linux-foundation.org> 1235688357 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235688357 -0800

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

* git://git.infradead.org/mtd-2.6:
  [MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver.
  [JFFS2] fix mount crash caused by removed nodes
  [JFFS2] force the jffs2 GC daemon to behave a bit better
  [MTD] [MAPS] blackfin async requires complex mappings
  [MTD] [MAPS] blackfin: fix memory leak in error path
  [MTD] [MAPS] physmap: fix wrong free and del_mtd_{partition,device}
  [MTD] slram: Handle negative devlength correctly
  [MTD] map_rom has NULL erase pointer
  [MTD] [LPDDR] qinfo_probe depends on lpddr