Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 4 Feb 2013 22:50:11 +0000 (17:50 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Feb 2013 22:50:11 +0000 (17:50 -0500)

Trivial merge