From: Tom Rini <trini@ti.com>
Date: Mon, 13 May 2013 22:17:39 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-x86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a661b99dbc35e725f229a7b8e189ca21304ba026;p=people%2Fms%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-x86
---

a661b99dbc35e725f229a7b8e189ca21304ba026