Merge branch 'acpi-pmic'
commit273b5a4836966eb192af9d01d0cdef2e30585864
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:42:48 +0000 (25 13:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:42:48 +0000 (25 13:42 +0200)
treefbde818e08decfd015972c3af6f9229c4a1b358c
parent6149dffcb54b9de3a42b2ea01bc4f9d38eeff7e0
parent6d3ef8d8f9ccd6d41b8f4836398875877b7a02b1
Merge branch 'acpi-pmic'

* acpi-pmic:
  ACPI / PMIC: remove modular references from non-modular code
  ACPI / PMIC: intel: initialize result to 0
  ACPI / PMIC: intel: add REGS operation region support
  ACPI / PMIC: Add opregion driver for Intel BXT WhiskeyCove PMIC
  ACPI / PMIC: modify the pen function signature to take bit field

Conflicts:
drivers/acpi/Makefile
drivers/acpi/Kconfig
drivers/acpi/Makefile