diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:31:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:31:45 -0800 |
| commit | fc1495bf99de6f65066b3234813180301ff8b693 (patch) | |
| tree | 4858db540f3c57f6f998383056ad4714b969660c /MAINTAINERS | |
| parent | 5476ffd2b78f06cce31a57f8611162918fe1ae3a (diff) | |
| parent | b38882f5c066dc681679e90f1903eda323e605b1 (diff) | |
Merge git://git.infradead.org/ubifs-2.6
* git://git.infradead.org/ubifs-2.6:
UBIFS: fix return code in check_leaf
UBI: flush wl before clearing update marker
MAINTAINERS: change e-mail of Artem Bityutskiy
UBIFS: remove manual O_SYNC handling
UBIFS: support mounting of UBI volume character devices
UBI: Add ubi_open_volume_path
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 746b706206d..d7f8668b7a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5335,7 +5335,7 @@ S: Maintained F: drivers/scsi/u14-34f.c UBI FILE SYSTEM (UBIFS) -M: Artem Bityutskiy <dedekind@infradead.org> +M: Artem Bityutskiy <dedekind1@gmail.com> M: Adrian Hunter <adrian.hunter@nokia.com> L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/ubifs-2.6.git @@ -5386,7 +5386,7 @@ F: drivers/cdrom/cdrom.c F: include/linux/cdrom.h UNSORTED BLOCK IMAGES (UBI) -M: Artem Bityutskiy <dedekind@infradead.org> +M: Artem Bityutskiy <dedekind1@gmail.com> W: http://www.linux-mtd.infradead.org/ L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/ubi-2.6.git |