From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Apr 2015 22:34:57 +0000 (+0200)
Subject: Merge branch 'acpi-scan'
X-Git-Tag: firefly_0821_release~176^2~1977^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1a7fd41ac24004fa1d7527828e9cad88bb1f8f5e;p=firefly-linux-kernel-4.4.55.git

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
---

1a7fd41ac24004fa1d7527828e9cad88bb1f8f5e