Merge branch 'patman' of http://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Thu, 28 Aug 2014 15:49:12 +0000 (11:49 -0400)
committerTom Rini <trini@ti.com>
Thu, 28 Aug 2014 15:49:12 +0000 (11:49 -0400)

Trivial merge