]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* acpi-scan:
  ata: ahci_platform: Add ACPI _CLS matching
  ACPI / scan: Add support for ACPI _CLS device matching

1  2 
include/linux/acpi.h

Simple merge