diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 13:42:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 13:42:35 -0400 |
commit | b928ed56182b8ea59bd43f2d5b865f13a54d5719 (patch) | |
tree | e9ba0ff9d316bdb84d6f2718d4543fd4213ba061 /MAINTAINERS | |
parent | ea6db58f3ea55f413c882095d2afaea8137f4f8c (diff) | |
parent | d468a030026017008286919aa6127b1190efb2c2 (diff) |
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6:
UBI: remove unused variable
UBI: add me to MAINTAINERS
JFFS2: add UBI support
UBI: Unsorted Block Images
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f56c7e172cee..2e83c82aa13d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2246,6 +2246,14 @@ L: linux-mtd@lists.infradead.org | |||
2246 | T: git git://git.infradead.org/mtd-2.6.git | 2246 | T: git git://git.infradead.org/mtd-2.6.git |
2247 | S: Maintained | 2247 | S: Maintained |
2248 | 2248 | ||
2249 | UNSORTED BLOCK IMAGES (UBI) | ||
2250 | P: Artem Bityutskiy | ||
2251 | M: dedekind@infradead.org | ||
2252 | W: http://www.linux-mtd.infradead.org/ | ||
2253 | L: linux-mtd@lists.infradead.org | ||
2254 | T: git git://git.infradead.org/ubi-2.6.git | ||
2255 | S: Maintained | ||
2256 | |||
2249 | MICROTEK X6 SCANNER | 2257 | MICROTEK X6 SCANNER |
2250 | P: Oliver Neukum | 2258 | P: Oliver Neukum |
2251 | M: oliver@neukum.name | 2259 | M: oliver@neukum.name |