Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Wed, 26 Aug 2015 21:48:05 +0000 (17:48 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 26 Aug 2015 21:48:05 +0000 (17:48 -0400)
commit79c884d7e449a63fa8f07b7495f8f9873355c48f
tree19adcc1b9d3520a68937a1f5f81b06775c790d8a
parentad608a21f89bf7467059ed59d60b080aace7ef99
parentf4b5db7c5309dd7f3ecc6369f3c1f41e8bfe93ae
Merge git://git.denx.de/u-boot-x86