Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 3 Dec 2012 13:47:05 +0000 (06:47 -0700)
committerTom Rini <trini@ti.com>
Mon, 3 Dec 2012 13:47:05 +0000 (06:47 -0700)

Trivial merge