Merge branch 'tpm' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 15 Apr 2013 11:45:07 +0000 (07:45 -0400)
committerTom Rini <trini@ti.com>
Mon, 15 Apr 2013 11:45:07 +0000 (07:45 -0400)

Trivial merge