diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 18:56:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 18:56:55 -0500 |
commit | 51eaaa677691f8da526ce5a3d89e08ee2d2669ce (patch) | |
tree | dbe679a849eb41990ffdf54d82518e5f45965271 /MAINTAINERS | |
parent | b7d626606201c397319b40721ca558b7e54040d5 (diff) | |
parent | 3477d204658733aa3a87d3ae03b0327c1e599517 (diff) |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: pre-allocate bulk-read buffer
UBIFS: do not allocate too much
UBIFS: do not print scary memory allocation warnings
UBIFS: allow for gaps when dirtying the LPT
UBIFS: fix compilation warnings
MAINTAINERS: change UBI/UBIFS git tree URLs
UBIFS: endian handling fixes and annotations
UBIFS: remove printk
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d06122d0462..8f2b67ea0549 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4236,7 +4236,7 @@ M: dedekind@infradead.org | |||
4236 | P: Adrian Hunter | 4236 | P: Adrian Hunter |
4237 | M: ext-adrian.hunter@nokia.com | 4237 | M: ext-adrian.hunter@nokia.com |
4238 | L: linux-mtd@lists.infradead.org | 4238 | L: linux-mtd@lists.infradead.org |
4239 | T: git git://git.infradead.org/~dedekind/ubifs-2.6.git | 4239 | T: git git://git.infradead.org/ubifs-2.6.git |
4240 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html | 4240 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html |
4241 | S: Maintained | 4241 | S: Maintained |
4242 | 4242 | ||
@@ -4290,7 +4290,7 @@ P: Artem Bityutskiy | |||
4290 | M: dedekind@infradead.org | 4290 | M: dedekind@infradead.org |
4291 | W: http://www.linux-mtd.infradead.org/ | 4291 | W: http://www.linux-mtd.infradead.org/ |
4292 | L: linux-mtd@lists.infradead.org | 4292 | L: linux-mtd@lists.infradead.org |
4293 | T: git git://git.infradead.org/~dedekind/ubi-2.6.git | 4293 | T: git git://git.infradead.org/ubi-2.6.git |
4294 | S: Maintained | 4294 | S: Maintained |
4295 | 4295 | ||
4296 | USB ACM DRIVER | 4296 | USB ACM DRIVER |