Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 May 2014 22:20:18 +0000 (00:20 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 May 2014 22:20:18 +0000 (00:20 +0200)
commit25d6db963c6eec38ba542e08f9b5fe40761a9177
tree23151f27645c62304d5e62ee7148e90957b391f2
parentd705116f278fb5417ef6092f2f9c858975464991
parenta8d22396302b7e4e5f0a594c1c1594388c29edaf
Merge branch 'pnp'

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