From: Tom Rini <trini@ti.com>
Date: Tue, 13 Jan 2015 18:39:25 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2015.04-rc1~195
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f88ed5cde04612e5b4520327b82d81a3f5493a0;p=pandora-u-boot.git

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

5f88ed5cde04612e5b4520327b82d81a3f5493a0