summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-07-05 13:03:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-07-05 13:03:43 +0200
commitdf958569dbaa398f525057729717e44809ac4306 (patch)
tree40b61e02cc4c1f40cfb968631ceed2110a5654cc /drivers/acpi
parent673b4271665a12fa839a12abb50e6f6e9953c081 (diff)
parent30998033f62a9915e0f884d680569a39bc9ce133 (diff)
parenta0d5f3b69af7733f3173a8e19d51f68a08017c76 (diff)
downloadlinux-df958569dbaa398f525057729717e44809ac4306.tar.bz2
Merge branches 'acpi-tables' and 'acpica'
Merge ACPICA regression fix and a fix for the recently added PPTT support. * acpi-tables: ACPI / PPTT: use ACPI ID whenever ACPI_PPTT_ACPI_PROCESSOR_ID_VALID is set * acpica: ACPICA: Drop leading newlines from error messages