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)
1  2 
include/configs/x86-common.h

Simple merge