Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Mon, 23 May 2016 22:32:47 +0000 (18:32 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 23 May 2016 22:32:47 +0000 (18:32 -0400)
commit6d54868eeb2697c9a905c4d3521efbacc44c5258
tree6ad3ae03a0083d1a50a6152bd6dcad5630ce7823
parentd7d000311285e4b8d11e089ca13ea456a01be3b8
parent8216b11cdd50515fbc423a4b2709a00865b8621d
Merge branch 'master' of git://git.denx.de/u-boot-x86