From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 5 Jan 2014 14:55:34 +0000 (+0100)
Subject: Merge branch 'acpi-tpm' into acpi-dsm
X-Git-Tag: firefly_0821_release~176^2~4583^2~9^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e73be4a78b500374a1c42810dc073189036b4dd8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-tpm' into acpi-dsm
---

e73be4a78b500374a1c42810dc073189036b4dd8