tree fda7a8df71f7ac5b1a4082dd612d3f4cfd17bcf1
parent 70a90b78c692ba9113ff2c2b7bab5b0fc0217ada
parent c18f90138517b43c25f608ec3f759a5d31b75f5e
author Tom Rini <trini@ti.com> 1366026307 -0400
committer Tom Rini <trini@ti.com> 1366026307 -0400

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