summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-27 23:27:08 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-27 23:27:08 (GMT)
commit772c7137bcad56856e858b46f2d378d62dc83055 (patch)
tree05772b9ad30e8caecabffde9eb618679fa6f753f /crypto
parent52addcf9d6669fa439387610bc65c92fa0980cef (diff)
parent236105db632c6279a020f78c83e22eaef746006b (diff)
parent558e4736f2e1b0e6323adf7a5e4df77ed6cfc1a4 (diff)
parent1bfbd8eb8a7f6f1eb573ccdfae5c86395abc79cb (diff)
downloadlinux-772c7137bcad56856e858b46f2d378d62dc83055.tar.xz
Merge branches 'acpi-scan', 'acpi-ec' and 'acpi-lpss'
* acpi-scan: ACPI: Run fixed event device notifications in process context ACPI / scan: Allow ACPI drivers to bind to PNP device objects * acpi-ec: ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC ACPI / EC: Add support to disallow QR_EC to be issued when SCI_EVT isn't set * acpi-lpss: ACPI / LPSS: Add ACPI IDs for Intel Braswell