diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-29 08:51:48 -0700 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-29 08:51:48 -0700 |
commit | ed32f8d42cee118b075e4372a55c7739a11094b2 (patch) | |
tree | 5a806c5168d4177e0536b98b6bda30ec4bdbac43 /Documentation/driver-api/nvdimm/index.rst | |
parent | drm/i915: Flush the i915_vm_release before ggtt shutdown (diff) | |
parent | Linus 5.3-rc1 (diff) | |
download | linux-ed32f8d42cee118b075e4372a55c7739a11094b2.tar.gz linux-ed32f8d42cee118b075e4372a55c7739a11094b2.tar.bz2 linux-ed32f8d42cee118b075e4372a55c7739a11094b2.zip |
Merge drm/drm-next into drm-intel-next-queued
Catching up with 5.3-rc*
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'Documentation/driver-api/nvdimm/index.rst')
-rw-r--r-- | Documentation/driver-api/nvdimm/index.rst | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/driver-api/nvdimm/index.rst b/Documentation/driver-api/nvdimm/index.rst new file mode 100644 index 000000000000..a4f8f98aeb94 --- /dev/null +++ b/Documentation/driver-api/nvdimm/index.rst @@ -0,0 +1,12 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=================================== +Non-Volatile Memory Device (NVDIMM) +=================================== + +.. toctree:: + :maxdepth: 1 + + nvdimm + btt + security |