diff options
| author | Linus Torvalds <[email protected]> | 2018-03-22 23:20:25 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-03-22 23:20:25 +0000 |
| commit | e7d7743f1be5f15caebbf13713d1eb0a5f08b5c2 (patch) | |
| tree | bf4f5acaee7dea9aeb98c5a08c1be084354903db /net/ipv4/tcp_timer.c | |
| parent | Merge tag 'modules-for-v4.16-rc7' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Merge branch 'acpi-wdat' (diff) | |
| download | kernel-e7d7743f1be5f15caebbf13713d1eb0a5f08b5c2.tar.gz kernel-e7d7743f1be5f15caebbf13713d1eb0a5f08b5c2.zip | |
Merge tag 'acpi-4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These revert one recent commit that added incorrect battery quirks for
some Asus systems and fix an off-by-one error in the watchdog driver
based on the ACPI WDAT table.
Specifics:
- Revert the recent change adding battery quirks for Asus GL502VSK
and UX305LA as these quirks turn out to be inadequate and possibly
premature (Daniel Drake).
- Fix an off-by-one error in the resource allocation part of the
watchdog driver based on the ACPI WDAT table (Takashi Iwai)"
* tag 'acpi-4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / watchdog: Fix off-by-one error at resource assignment
Revert "ACPI / battery: Add quirk for Asus GL502VSK and UX305LA"
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions