Merge branch 'acpi-scan'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 7 Jul 2015 20:48:25 +0000 (22:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 7 Jul 2015 20:48:25 +0000 (22:48 +0200)
commit8076ca480f40c51ab87d8301c830a817b900b4d1
tree63fec44892b0566f47102348f1c208fcabee513f
parentd0aee67fa19260d772b07f144cf6c93e63431f67
parent2051e9248688e4c36e4de2e93b88fa0d74e86261
Merge branch 'acpi-scan'

* acpi-scan:
  ata: ahci_platform: Add ACPI _CLS matching
  ACPI / scan: Add support for ACPI _CLS device matching
include/linux/acpi.h