From: Tom Rini <trini@ti.com>
Date: Wed, 29 Oct 2014 19:57:59 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2015.01-rc1~69
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c54cb5516238ae93c930dee7f8e353291f2cdfb;p=u-boot

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

2c54cb5516238ae93c930dee7f8e353291f2cdfb