diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-20 21:09:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-20 21:09:10 +0300 |
| commit | 73894397e70e537fea5331bfea9e920ae2e6387c (patch) | |
| tree | 69fa9e32509b870f587a303d9d08c4ad93906260 /net/ipv4/ipcomp.c | |
| parent | 28c20cc73b9cc4288c86c2a3fc62af4087de4b19 (diff) | |
| parent | 2c4d6baf1bc4f7729773ffcee9ba2a9781578633 (diff) | |
| download | linux-73894397e70e537fea5331bfea9e920ae2e6387c.tar.xz | |
Merge tag 'acpi-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Extend the recently added suspend-to-idle quirk for Thinkpad X1 Carbon
6th to other systems from that familiy which turned out to need it too
(Robin Johnson)"
* tag 'acpi-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
Diffstat (limited to 'net/ipv4/ipcomp.c')
0 files changed, 0 insertions, 0 deletions