Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 27 Oct 2007 17:14:04 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 27 Oct 2007 17:14:04 +0000 (10:14 -0700)
commitef49c32b8489a845a54ca4689b17bfbf8db9bf9e
tree6b347590b2ba52c9a4e6eac701bb2ecd9323a82f
parent3d1343b55643d60839d711205076e75754e9126e
parent6d85d06673db74ec7ff4aa31e47b1e2e7a5af7cb
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  [JFFS2] Update MAINTAINERS entry -- the jffs-dev list is dead
  [JFFS2] Prevent return of initialised variable in jffs2_init_acl_post()