diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-30 09:47:41 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-30 09:47:41 +0300 |
| commit | 44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2 (patch) | |
| tree | ec97ee26c9715f8da24377e9cacc63261b0aa2ab /Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x | |
| parent | 40a4a5727f21a0e439d317aa99953e24467605eb (diff) | |
| parent | 2d4df13c0f9ef56452b1d9a9016cb3946e17bfe5 (diff) | |
| download | linux-44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Backmerge to catch up with 4.3. slightly more involved conflict in the
irq code, but nothing beyond adjacent changes.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x index 2fe2e3dae487..2355ed8ae31f 100644 --- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x @@ -249,7 +249,7 @@ KernelVersion: 4.01 Contact: Mathieu Poirier <mathieu.poirier@linaro.org> Description: (RW) Select which context ID comparator to work with. -What: /sys/bus/coresight/devices/<memory_map>.etm/ctxid_val +What: /sys/bus/coresight/devices/<memory_map>.etm/ctxid_pid Date: April 2015 KernelVersion: 4.01 Contact: Mathieu Poirier <mathieu.poirier@linaro.org> |