From: Tom Rini <trini@ti.com>
Date: Thu, 9 Jan 2014 16:04:53 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sh
X-Git-Tag: v2014.01-rc3~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33d413fc91e0bbbb92962a80f5333d6f1f628c5b;p=oweals%2Fu-boot.git

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

33d413fc91e0bbbb92962a80f5333d6f1f628c5b