Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 22 Apr 2016 11:25:18 +0000 (07:25 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 22 Apr 2016 11:25:18 +0000 (07:25 -0400)
commit65341967ce9ef2656c61dcd3126536e8865c349d
treec6c2f428d344c1292505796e5988f24be427bcc8
parent2a8382c6fe7ddf0e15791b3ffa5f390a674a212b
parent7b63b1832b6e7671c4009bc084045a19cd86c87c
Merge branch 'master' of git://git.denx.de/u-boot-x86