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/ABI/testing/sysfs-driver-ppi | |
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/ABI/testing/sysfs-driver-ppi')
-rw-r--r-- | Documentation/ABI/testing/sysfs-driver-ppi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-ppi b/Documentation/ABI/testing/sysfs-driver-ppi index 9921ef285899..1a56fc507689 100644 --- a/Documentation/ABI/testing/sysfs-driver-ppi +++ b/Documentation/ABI/testing/sysfs-driver-ppi @@ -1,6 +1,6 @@ What: /sys/class/tpm/tpmX/ppi/ Date: August 2012 -Kernel Version: 3.6 +KernelVersion: 3.6 Contact: xiaoyan.zhang@intel.com Description: This folder includes the attributes related with PPI (Physical |