Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 29 Sep 2015 17:14:21 +0000 (13:14 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 29 Sep 2015 17:14:21 +0000 (13:14 -0400)
commit4af90a6d033bdde93d2fe03ed884a20e9359c4e5
tree8faecca1a6ac8464701fa4eaefd41d002399afa8
parent46f166caad48ed38f6ccc0c2fc6d1828d15dacb2
parent196193a4d4963a8dde00c7cdd0ec83b60ea61e61
Merge git://git.denx.de/u-boot-x86