diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 10:42:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 10:42:35 -0700 |
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 f56c7e172ce..2e83c82aa13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2246,6 +2246,14 @@ L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/mtd-2.6.git S: Maintained +UNSORTED BLOCK IMAGES (UBI) +P: Artem Bityutskiy +M: dedekind@infradead.org +W: http://www.linux-mtd.infradead.org/ +L: linux-mtd@lists.infradead.org +T: git git://git.infradead.org/ubi-2.6.git +S: Maintained + MICROTEK X6 SCANNER P: Oliver Neukum M: oliver@neukum.name |