diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 13:50:08 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 13:50:08 -0400 |
| commit | 1ed41b5696ccc3ff40a1dee39fe14eff273faf82 (patch) | |
| tree | 1202df08129d350a65cf220406eb7ce87185d813 /MAINTAINERS | |
| parent | 3eb2ce825ea1ad89d20f7a3b5780df850e4be274 (diff) | |
| parent | 291717b6fbdb175da88ae2144fc58d63a490128d (diff) | |
Merge branch 'for-4.17/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 73c0cdabf755..821700479d6b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8035,6 +8035,14 @@ Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ | |||
| 8035 | S: Supported | 8035 | S: Supported |
| 8036 | F: drivers/nvdimm/pmem* | 8036 | F: drivers/nvdimm/pmem* |
| 8037 | 8037 | ||
| 8038 | LIBNVDIMM: DEVICETREE BINDINGS | ||
| 8039 | M: Oliver O'Halloran <oohall@gmail.com> | ||
| 8040 | L: linux-nvdimm@lists.01.org | ||
| 8041 | Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ | ||
| 8042 | S: Supported | ||
| 8043 | F: drivers/nvdimm/of_pmem.c | ||
| 8044 | F: Documentation/devicetree/bindings/pmem/pmem-region.txt | ||
| 8045 | |||
| 8038 | LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM | 8046 | LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM |
| 8039 | M: Dan Williams <dan.j.williams@intel.com> | 8047 | M: Dan Williams <dan.j.williams@intel.com> |
| 8040 | L: linux-nvdimm@lists.01.org | 8048 | L: linux-nvdimm@lists.01.org |