Merge branch 'acpi-scan'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Apr 2015 22:34:57 +0000 (00:34 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Apr 2015 22:34:57 +0000 (00:34 +0200)
* acpi-scan:
  ACPI / scan: Rework modalias creation when "compatible" is present
  ACPI / scan: Take the PRP0001 position in the list of IDs into account
  ACPI / scan: Simplify acpi_match_device()
  ACPI / scan: Generalize of_compatible matching
  ACPI / scan: fix fixed event handler return value


Trivial merge