Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 26 Jan 2015 22:44:49 +0000 (17:44 -0500)
committerTom Rini <trini@ti.com>
Mon, 26 Jan 2015 22:44:49 +0000 (17:44 -0500)
commitab92da9f47d51d363c7de42e2a7bd807e2c1bd54
treedfabc29929e39a1ecc47edf5a4cf839ead062acd
parentaed03faa064cca56847571b13cbd4c849c6116aa
parente43ade3749ff10bc313f33bf23705465e4163896
Merge branch 'master' of git://git.denx.de/u-boot-x86