diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2022-10-05 10:21:55 +0100 |
---|---|---|
committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2022-10-05 10:21:55 +0100 |
commit | edd1533d3ccd82dd5d600986d27d524e6be4c5fd (patch) | |
tree | 1ac5ae82ea63114d5c13212e2819531e4507f800 /tools/perf/pmu-events/arch/x86/bonnell/other.json | |
parent | Merge branch 'for-6.1/core' into for-linus (diff) | |
parent | hid: hid-logitech-hidpp: avoid unnecessary assignments in hidpp_connect_event (diff) | |
download | linux-dev-edd1533d3ccd82dd5d600986d27d524e6be4c5fd.tar.xz linux-dev-edd1533d3ccd82dd5d600986d27d524e6be4c5fd.zip |
Merge branch 'for-6.1/logitech' into for-linus
- Add hanlding of all Bluetooth HID++ devices and fixes in hid++
(Bastien Nocera)
Diffstat (limited to 'tools/perf/pmu-events/arch/x86/bonnell/other.json')
-rw-r--r-- | tools/perf/pmu-events/arch/x86/bonnell/other.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/pmu-events/arch/x86/bonnell/other.json b/tools/perf/pmu-events/arch/x86/bonnell/other.json index 114c062e7e96..e0bdcfbfa9dc 100644 --- a/tools/perf/pmu-events/arch/x86/bonnell/other.json +++ b/tools/perf/pmu-events/arch/x86/bonnell/other.json @@ -447,4 +447,4 @@ "SampleAfterValue": "200000", "UMask": "0xc0" } -]
\ No newline at end of file +] |