From: Tom Rini <trini@ti.com>
Date: Mon, 15 Dec 2014 22:13:47 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=b9206e61f3d87535ac4f4b0b858e674fd1edfeaf

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

b9206e61f3d87535ac4f4b0b858e674fd1edfeaf