Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Thu, 28 Jan 2016 15:07:22 +0000 (10:07 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 28 Jan 2016 15:07:22 +0000 (10:07 -0500)
commit4b5a4a0535e280279e8cab93ba6d4aad53896bda
tree4fa29a88ad6e46ed889b65fef753f835a3685a67
parentcd85bec36d0e0d16fedb00e0c434ed070a9c6b37
parent81aaa3d9fce5ce9641e5f0c3354da876d859b3b6
Merge branch 'master' of git://git.denx.de/u-boot-x86