summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-07-08 11:02:22 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-07-08 11:02:22 +0200
commit8ca572ec3c9c0ad372550d3fd2535ad7b943f474 (patch)
tree0b84742461976b877b220fae7c7f907eacf00d11 /include/acpi
parent417a564c65881d26c7600c146e114a438a223ecf (diff)
parentd06c47e3dd07fdf3f07e8fc45f2ce655e9b295c5 (diff)
parent9fe51603d953419b8da74f455269eca8e6b84228 (diff)
parentfb683f47a9fb824dc11d529119354d1a88a96ca2 (diff)
parentb1954bbf1272e64a68aef745b10e2380ad84be01 (diff)
Merge branches 'acpi-tables', 'acpi-osl', 'acpi-misc' and 'acpi-tools'
* acpi-tables: ACPI: configfs: Resolve objects on host-directed table loads ACPI: tables: Allow BGRT to be overridden * acpi-osl: ACPI: OSL: Make a W=1 kernel-doc warning go away * acpi-misc: ACPI: Make AC and battery drivers available on !X86 * acpi-tools: ACPI: tools: Exclude tools/* from .gitignore patterns