Commit ef49c32b authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 3d1343b5 6d85d066
......@@ -2129,8 +2129,8 @@ S: Maintained
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
P: David Woodhouse
M: dwmw2@infradead.org
L: jffs-dev@axis.com
W: http://sources.redhat.com/jffs2/
L: linux-mtd@lists.infradead.org
W: http://www.linux-mtd.infradead.org/doc/jffs2.html
S: Maintained
JFS FILESYSTEM
......
......@@ -372,7 +372,7 @@ int jffs2_init_acl_post(struct inode *inode)
return rc;
}
return rc;
return 0;
}
void jffs2_clear_acl(struct jffs2_inode_info *f)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment