Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 13:55:16 +0000 (09:55 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 13:55:16 +0000 (09:55 -0400)
commitb57129dbdade13ee152daf15a4221d8582f48387
tree6f3930a8a77cb163233e0cd6b1dcbe9784e776ec
parenta646f6698173ef4ff34c414f91541b4b8f014de1
parent9769e05bcf79939bad23a719982dd1f85a110f3c
Merge branch 'master' of git://git.denx.de/u-boot-x86