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)
commit1a7fd41ac24004fa1d7527828e9cad88bb1f8f5e
tree27add3b9e4da730a0164120218c3057f72966e1c
parentf303906d4d5c22cdffe309807e2e21d9b8ff9a91
parent8765c5ba19490c9167fe0c4e05c2dfdcc39873a3
Merge branch 'acpi-scan'

* 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