From: Tom Rini <trini@ti.com>
Date: Tue, 16 Apr 2013 20:12:33 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-x86
X-Git-Tag: v2013.04~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=314dd4fecc87175f6e79eb977966fb60b33c543c;p=oweals%2Fu-boot.git

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

314dd4fecc87175f6e79eb977966fb60b33c543c