Merge branch 'master' of git://www.denx.de/git/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 28 Nov 2012 20:44:40 +0000 (13:44 -0700)
committerTom Rini <trini@ti.com>
Wed, 28 Nov 2012 20:44:40 +0000 (13:44 -0700)

Trivial merge