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)
* device-properties:
  ACPI / platform: Add support for build-in properties

1  2 
drivers/acpi/acpi_apd.c
drivers/acpi/acpi_platform.c
drivers/acpi/scan.c
include/linux/acpi.h

Simple merge
Simple merge
Simple merge
Simple merge