summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-05 18:55:34 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-05 18:55:34 +0400
commite73be4a78b500374a1c42810dc073189036b4dd8 (patch)
tree17b2e6481e68d95ff8b4a27931062c13f2621bd5 /include/acpi
parentd6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff)
parentdf45c712d1f4ef37714245fb75de726f4ca2bf8d (diff)
downloadlinux-e73be4a78b500374a1c42810dc073189036b4dd8.tar.xz
Merge branch 'acpi-tpm' into acpi-dsm
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions