diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:26:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:26:43 +0200 |
| commit | 03471c06d02f80f9338a5df45f2a92ef38ca1233 (patch) | |
| tree | cb448c9cac9eff99d3d6046a3f7cefd9d659560e /net/xfrm/xfrm_user.c | |
| parent | bee5799e4fc53e518255a9f65e4d81ff58ce6c9b (diff) | |
| parent | ef75040ab7f179c30f084653c93bc0bbdbcaf17a (diff) | |
| parent | d37efb79bc1cc5763d5ac4a96b9ad2ecbddcbe8a (diff) | |
| download | linux-03471c06d02f80f9338a5df45f2a92ef38ca1233.tar.bz2 | |
Merge branches 'acpi-ec' and 'acpi-video'
* acpi-ec:
ACPI / EC: Add quirk for GL720VMK
ACPI / EC: Fix media keys not working problem on some Asus laptops
ACPI / EC: Add support to skip boot stage DSDT probe
ACPI / EC: Enhance boot EC sanity check
ACPI: EC: Fix EC command visibility for dynamic debug
ACPI: EC: Fix an EC event IRQ storming issue
* acpi-video:
ACPI / video: Add quirks for the Dell Precision 7510