Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:32:09 +0000 (08:32 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 17:59:26 +0000 (13:59 -0400)
commit5ebd27d860ec0c6e36f1b0f973653fe66a7360be
tree71ba0f39cc03c131889ce51803d85cf4c49b2941
parentf812574e61e9bfe37e76e620606fd1a65cc9cdc2
parent00bcaedd5c4063c677d16af264bbcb991fb9675c
Merge branch 'master' of git://git.denx.de/u-boot-x86
include/configs/x86-common.h