From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 2 May 2014 22:20:18 +0000 (+0200)
Subject: Merge branch 'pnp'
X-Git-Tag: firefly_0821_release~176^2~3960^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=25d6db963c6eec38ba542e08f9b5fe40761a9177;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pnp'

* pnp:
  PNP / ACPI: Do not return errors if _DIS or _SRS are not present
  PNP: Fix compile error in quirks.c
---

25d6db963c6eec38ba542e08f9b5fe40761a9177