Merge branch 'tpm' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 5 Jun 2013 12:55:35 +0000 (08:55 -0400)
committerTom Rini <trini@ti.com>
Wed, 5 Jun 2013 12:55:35 +0000 (08:55 -0400)
commit1318d00e5894ac55bc6b7297f3eda97983b79fae
tree61af0fa9a78277998455eac609bb72d4a2058ea2
parent99bd544ee76af3302b8421eaaddfe61f56915fc6
parent1b393db5870927d68c42a46e6c5877c8d0d83910
Merge branch 'tpm' of git://git.denx.de/u-boot-x86