summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-05 22:50:54 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-05 22:50:54 +0200
commit7ef97e0e3a0f4b02601dde384127cc85d27e46e2 (patch)
tree01a7482d3986cae96b341088c1a3dca7aa72f207
parentbf74dc001cc08cc56a6cc266564e0c32d0fcebad (diff)
parent7f94fde6e738b4492d6923fe8ece459441a6a2ec (diff)
parent3a54a57dceed78f7f3c35991d6d4a064a0c2e343 (diff)
parent515afdcba0880528fa8ae6fa63a14de6b9018770 (diff)
parent43218a1b3ba7c8e39d88b5c0a43841f0e3e17470 (diff)
Merge branches 'acpi-video', 'acpi-battery', 'acpi-processor' and 'acpi-lpss'pm+acpi-3.17-rc1
* acpi-video: ACPI / video: Add use_native_backlight quirk for HP EliteBook 2014 models * acpi-battery: ACPI / battery: remove duplicated include from battery.c * acpi-processor: ACPI / processor: Make it possible to get local x2apic id via _MAT * acpi-lpss: ACPI / LPSS: add LPSS device for Wildcat Point PCH