From: Tom Rini <trini@konsulko.com>
Date: Fri, 9 Oct 2015 13:55:33 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2015.10-rc5~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38ab75a2aa54b97429b2f33ff5d3c7ddcabf1456;p=thirdparty%2Fu-boot.git

Merge git://git.denx.de/u-boot-x86
---

38ab75a2aa54b97429b2f33ff5d3c7ddcabf1456