Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Thu, 21 Dec 2017 14:54:10 +0000 (09:54 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 21 Dec 2017 14:54:10 +0000 (09:54 -0500)
commit48a346061d1f0a7eff566f6a7cc7eeeba7efb1e2
treed88caba2674fc191082eb4f6c2b1b6884134dee0
parentb55c89ce0207d3a504238c1b8f268c56035656a3
parent1602d215b595b9cf4be460101f5c8892623fe3a0
Merge git://git.denx.de/u-boot-x86