tree ccb287245ff7e90ee728b01643d563b95af05288
parent 2fb585a10e421b4eeae066eb99080bd7e4512079
parent ab5610b434645518aca6e4de5ad851f9fef006f3
author Linus Torvalds <torvalds@linux-foundation.org> 1231543744 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231543744 -0800

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

* git://git.infradead.org/mtd-2.6:
  [JFFS2] remove junk prototypes