]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:43:03 +0000 (13:43 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:43:03 +0000 (13:43 +0200)
commit3deab95c38ff7708d2c6147b17719e74275a956a
tree563e67a8ef03451adf542d0273be62bf754d2a0b
parent8338f648b5fd5d737a82603f12ad3c2c688e2855
parent40278358f95c68fe61d831c89e084eb7cdba9ecf
parent308c4ae13f55dffd08159f66c3468ce644e784b3
parent574158a0d071e70199c8fb364e79eebff571efeb
Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools'

* acpi-drivers:
  ACPI / DPTF: move int340x_thermal.c to the DPTF folder
  ACPI / DPTF: Add DPTF power participant driver

* acpi-misc:
  ACPI / lpat: make it explicitly non-modular
  ACPI / dock: make dock explicitly non-modular

* acpi-tools:
  tools/acpi: use CROSS_COMPILE to define prefix
drivers/acpi/Kconfig
drivers/acpi/Makefile