Merge back earlier acpi-pnp material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jul 2014 22:24:40 +0000 (00:24 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jul 2014 22:24:40 +0000 (00:24 +0200)
commitfeb41bb1ca6b969985cd5e486a3f2deac9f089fa
treeaeb6c21669858b06c1086cb3fe4d5d8124329835
parentb6328a07bd6b3d31b64f85864fe74f3b08c010ca
parente70dba6020eaaceb1d3619dfb535c719900c7091
Merge back earlier acpi-pnp material.

Conflicts:
drivers/pnp/pnpacpi/core.c