tree aeb6c21669858b06c1086cb3fe4d5d8124329835
parent b6328a07bd6b3d31b64f85864fe74f3b08c010ca
parent e70dba6020eaaceb1d3619dfb535c719900c7091
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1406672680 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1406672680 +0200

Merge back earlier acpi-pnp material.

Conflicts:
	drivers/pnp/pnpacpi/core.c