Merge branch 'acpi-tpm' into acpi-dsm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:55:34 +0000 (15:55 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:55:34 +0000 (15:55 +0100)
commite73be4a78b500374a1c42810dc073189036b4dd8
tree17b2e6481e68d95ff8b4a27931062c13f2621bd5
parentd6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc
parentdf45c712d1f4ef37714245fb75de726f4ca2bf8d
Merge branch 'acpi-tpm' into acpi-dsm