From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 29 Jul 2014 22:24:40 +0000 (+0200)
Subject: Merge back earlier acpi-pnp material.
X-Git-Tag: v3.17-rc1~99^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=feb41bb1ca6b969985cd5e486a3f2deac9f089fa;p=thirdparty%2Flinux.git

Merge back earlier acpi-pnp material.

Conflicts:
	drivers/pnp/pnpacpi/core.c
---

feb41bb1ca6b969985cd5e486a3f2deac9f089fa