summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-02 10:58:39 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-02 10:58:39 +0200
commit81616dfa2d097024ca214689f80332b3cf66ddfc (patch)
tree4a4c6739c21d2fc094ec12ecdf06e5f9d1e48cdf /drivers/acpi
parent0c9ed61bddd27cf95067e17c3d25634e25c4204b (diff)
parent24bada7991d9f1d412f9bfca36716e8457cb4f90 (diff)
parentd29abc836843b8c9537b4d778eb2d429a804a5ed (diff)
parent92d1b381f677cbd2d4370dc3b8d0679b7f0ace32 (diff)
downloadlinux-81616dfa2d097024ca214689f80332b3cf66ddfc.tar.bz2
Merge branches 'acpi-tables', 'acpi-cppc' and 'acpi-pci'
* acpi-tables: ACPI: add NFIT and HMAT to the initrd override list * acpi-cppc: ACPI / CPPC: Update all pr_(debug/err) messages to log the susbspace id * acpi-pci: ACPI / PCI: pci_link: Allow the absence of _PRS and change log level