Merge branch 'device-properties'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Nov 2016 22:23:02 +0000 (23:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Nov 2016 22:23:02 +0000 (23:23 +0100)
commit66f5854c6894dc028fc13345838c6f82bfcfef0c
tree76ac271549bca0d1199df15e1087dcd0d3c6e911
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911
parent1571875beecd5de9657f73931449bda1b1329b6f
Merge branch 'device-properties'

* device-properties:
  ACPI / platform: Add support for build-in properties
drivers/acpi/acpi_apd.c
drivers/acpi/acpi_platform.c
drivers/acpi/scan.c
include/linux/acpi.h