Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Wed, 15 Jul 2015 14:41:20 +0000 (10:41 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 15 Jul 2015 14:41:20 +0000 (10:41 -0400)
commit605e15db2b54302364a2528d3c6604fbc57be846
tree1a1e344964bff1719939183124d66a71e7ca7731
parent4905dfc65d9a17083727865302d2cf633c15c911
parentf110da9984c0aa0aba9e1c4178b67b7abecf7e8d
Merge git://git.denx.de/u-boot-x86