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)
* git://git.infradead.org/mtd-2.6:
  [JFFS2] remove junk prototypes


Trivial merge