From: Tom Rini <trini@ti.com>
Date: Wed, 5 Jun 2013 12:55:35 +0000 (-0400)
Subject: Merge branch 'tpm' of git://git.denx.de/u-boot-x86
X-Git-Tag: v2025.01-rc5-pxa1908~16205
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=1318d00e5894ac55bc6b7297f3eda97983b79fae;p=u-boot.git

Merge branch 'tpm' of git://git.denx.de/u-boot-x86
---

1318d00e5894ac55bc6b7297f3eda97983b79fae