tree 61af0fa9a78277998455eac609bb72d4a2058ea2
parent 99bd544ee76af3302b8421eaaddfe61f56915fc6
parent 1b393db5870927d68c42a46e6c5877c8d0d83910
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