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: v3.14-rc1~107^2~9^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e73be4a78b500374a1c42810dc073189036b4dd8;p=kernel%2Fkernel-generic.git

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

e73be4a78b500374a1c42810dc073189036b4dd8