]> 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)
commitb5cec419ef66679f20b305f043097831e658cbdb
tree563e67a8ef03451adf542d0273be62bf754d2a0b
parent4cb864d8aeb407ce85d4c0d39654611aeb872045
parentb66173b47b6a4f09c0d91c62356fcb96600af63d
parent93755c31f4a22238edae22a719539b0ed05da52c
parent92ae7210c28006999378951a49687bcb076820a9
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