Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 16 Apr 2013 20:12:33 +0000 (16:12 -0400)
committerTom Rini <trini@ti.com>
Tue, 16 Apr 2013 20:12:33 +0000 (16:12 -0400)

Trivial merge