Merge branch 'acpi-ec'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Jun 2016 21:48:54 +0000 (23:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Jun 2016 21:48:54 +0000 (23:48 +0200)
commitbd6ac2abc9937eb7613aa194195fd98fe9312b38
treef7386c717352410ba2fdfc45d1cb1b29aba8f9f2
parentaf8c34ce6ae32addda3788d54a7e340cad22516b
parentdcf15cbded656a12335bc4151f3f75f10080a375
Merge branch 'acpi-ec'

* acpi-ec:
  ACPI / EC: Fix a boot EC regresion by restoring boot EC support for the DSDT EC
drivers/acpi/internal.h