Merge branches 'device-properties-fixes' and 'acpica-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Mar 2016 13:22:54 +0000 (14:22 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Mar 2016 13:22:54 +0000 (14:22 +0100)
* device-properties-fixes:
  device property: fwnode->secondary may contain ERR_PTR(-ENODEV)

* acpica-fixes:
  ACPICA: Revert "Parser: Fix for SuperName method invocation"


Trivial merge