]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 417a564 d06c47e 9fe5160 fb683f4 b1954bb)
Merge branches 'acpi-tables', 'acpi-osl', 'acpi-misc' and 'acpi-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Jul 2019 09:02:22 +0000 (11:02 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Jul 2019 09:02:22 +0000 (11:02 +0200)
* 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

1  2  3  4  5 
drivers/acpi/acpi_configfs.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history

diff --cc drivers/acpi/acpi_configfs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.