Merge branch 'buildpatman' of http://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 25 Nov 2013 15:42:05 +0000 (10:42 -0500)
committerTom Rini <trini@ti.com>
Mon, 25 Nov 2013 15:42:05 +0000 (10:42 -0500)

Trivial merge