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)

Trivial merge