From: Tom Rini <trini@ti.com>
Date: Mon, 3 Dec 2012 13:47:05 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-x86
X-Git-Tag: v2013.01-rc2~99
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce12a8c1a94a2b3d585feff387497f724b98e3ce;p=pandora-u-boot.git

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

ce12a8c1a94a2b3d585feff387497f724b98e3ce