Merge branch 'acpi-tpm' into acpi-dsm

This commit is contained in:
Rafael J. Wysocki 2014-01-05 15:55:34 +01:00
commit e73be4a78b