Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Wed, 5 Aug 2015 18:12:37 +0000 (14:12 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 5 Aug 2015 18:12:37 +0000 (14:12 -0400)
commit1a2728ae4faf12874173de156b8a7e66cfbbeae5
tree9aba8e6c915b341df8ec6077d8ecb28f1eb32b0b
parentdcc7dbc73169bb4e39f27c1d95bbf031ccfc1744
parent12c7510f17ff29190e52336910e43a50c0d620a6
Merge git://git.denx.de/u-boot-x86