diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 19:55:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 19:55:41 -0700 |
| commit | 88875667ebbcb95da3f93a4cf657d5dad7db9673 (patch) | |
| tree | 7ac0e4fd89c0dde4cb0ec22fd9f8ba9c71c2f8af /MAINTAINERS | |
| parent | Merge tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | ubifs: Remove unused header (diff) | |
| download | linux-dev-88875667ebbcb95da3f93a4cf657d5dad7db9673.tar.xz linux-dev-88875667ebbcb95da3f93a4cf657d5dad7db9673.zip | |
Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
"This contains cleanups and a maintainer update for UBI and UBIFS"
* tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs:
ubifs: Remove unused header
MAINTAINERS: Update UBIFS entry
mtd: ubi: Add logging functions ubi_msg, ubi_warn and ubi_err
ubifs: Add logging functions for ubifs_msg, ubifs_err and ubifs_warn
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 32bafda47c2f..cdee67fa9156 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11326,12 +11326,13 @@ S: Maintained F: drivers/scsi/u14-34f.c UBI FILE SYSTEM (UBIFS) +M: Richard Weinberger <richard@nod.at> M: Artem Bityutskiy <dedekind1@gmail.com> M: Adrian Hunter <adrian.hunter@intel.com> L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/ubifs-2.6.git W: http://www.linux-mtd.infradead.org/doc/ubifs.html -S: Maintained +S: Supported F: Documentation/filesystems/ubifs.txt F: fs/ubifs/ |