Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:29:04 +0000 (15:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:29:04 +0000 (15:29 -0800)
commit32b838b8cfa269d688889b3213e7ee37ee901f72
treeccb287245ff7e90ee728b01643d563b95af05288
parent2fb585a10e421b4eeae066eb99080bd7e4512079
parentab5610b434645518aca6e4de5ad851f9fef006f3
Merge git://git.infradead.org/mtd-2.6

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