diff --git a/[refs] b/[refs] index 8002f1653377..07b8c90da29b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d62f488585405bc9108c47cb06957397cfd1059 +refs/heads/master: 9527056630b68c94b94b94cd58c6cbb65e611fd1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 56a2f678019e..3882f9cf602e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2307,6 +2307,16 @@ L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/doc/jffs2.html S: Maintained +UBI FILE SYSTEM (UBIFS) +P: Artem Bityutskiy +M: dedekind@infradead.org +P: Adrian Hunter +M: ext-adrian.hunter@nokia.com +L: linux-mtd@lists.infradead.org +T: git git://git.infradead.org/~dedekind/ubifs-2.6.git +W: http://www.linux-mtd.infradead.org/doc/ubifs.html +S: Maintained + JFS FILESYSTEM P: Dave Kleikamp M: shaggy@austin.ibm.com