tree 61af0fa9a78277998455eac609bb72d4a2058ea2
parent 1247446ac2c32985cdd4ddbfa6adf424ef68cd66
parent e49fed584a697f48a9aad033f87d95bb3befaeab
author Tom Rini <trini@ti.com> 1370436935 -0400
committer Tom Rini <trini@ti.com> 1370436935 -0400

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