Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 13 May 2013 22:17:39 +0000 (18:17 -0400)
committerTom Rini <trini@ti.com>
Mon, 13 May 2013 22:17:39 +0000 (18:17 -0400)

Trivial merge