Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 12 Jul 2016 12:15:17 +0000 (08:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 12 Jul 2016 12:15:17 +0000 (08:15 -0400)
commitb8e599746cac1833328bc3a8e37eeefe346baf90
treeec49cc9ac3c8638fe11774e945cf0bcc4e87c1f4
parentbff97dde8c8cf6fd5f04bb26fca83f61eadc1741
parent9532fe3b40ddf66ef976dee3d5cf1d8b3396bf4d
Merge branch 'master' of git://git.denx.de/u-boot-x86