summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-11 14:22:54 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-11 14:22:54 +0100
commit5b3e7e0536bd6326798ab57d14a49b15ad7e3e3f (patch)
treee0d3178ac8e428211132b0b9cae998a391b231b1
parentf6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff)
parent7781203416ffc4e731619f8a8b93a37599a8f502 (diff)
parent0dda8851a88d6c9d6389f1caf69627154c39aceb (diff)
downloadlinux-5b3e7e0536bd6326798ab57d14a49b15ad7e3e3f.tar.bz2
Merge branches 'device-properties-fixes' and 'acpica-fixes'
* device-properties-fixes: device property: fwnode->secondary may contain ERR_PTR(-ENODEV) * acpica-fixes: ACPICA: Revert "Parser: Fix for SuperName method invocation"