From: Tom Rini <trini@konsulko.com>
Date: Thu, 17 Sep 2015 21:00:08 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2015.10-rc4~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1fb8d7933924aa5deb7e722d64c1d9fc7f0b2b82;p=oweals%2Fu-boot.git

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

1fb8d7933924aa5deb7e722d64c1d9fc7f0b2b82