From: Tom Rini <trini@ti.com>
Date: Fri, 19 Dec 2014 22:09:26 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2015.01-rc4~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8046ff0b0424c5e463e0180302c6f8d4d41a163;p=oweals%2Fu-boot.git

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

d8046ff0b0424c5e463e0180302c6f8d4d41a163