diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-22 19:26:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-22 19:26:33 -0700 |
| commit | 74a9e7dbbc4a45ee78560f36903f3c3b1f553928 (patch) | |
| tree | 2ffcf6afb86d82f075bb4ea3863cbd9b36978651 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'pm-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | Merge branches 'acpi-button' and 'acpi-tools' (diff) | |
| download | wireguard-linux-74a9e7dbbc4a45ee78560f36903f3c3b1f553928.tar.xz wireguard-linux-74a9e7dbbc4a45ee78560f36903f3c3b1f553928.zip | |
Merge tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These revert a 4.11 change that turned out to be problematic and add a
.gitignore file.
Specifics:
- Revert a 4.11 commit related to the ACPI-based handling of laptop
lids that made changes incompatible with existing user space stacks
and broke things there (Lv Zheng).
- Add .gitignore to the ACPI tools directory (Prarit Bhargava)"
* tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / button: Remove lid_init_state=method mode"
tools/power/acpi: Add .gitignore file
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions