From: Tom Rini <trini@ti.com>
Date: Fri, 7 Dec 2012 13:43:40 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-x86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4d564b3c80b111f18c93adb14233a6a7ddb0e9;p=u-boot.git

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

fd4d564b3c80b111f18c93adb14233a6a7ddb0e9