From: Tom Rini <trini@ti.com>
Date: Wed, 12 Dec 2012 13:51:02 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mips
X-Git-Tag: v2013.01-rc2~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=caddc17f3019a437b972cd04a8c9a9cbea344def;p=oweals%2Fu-boot.git

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

caddc17f3019a437b972cd04a8c9a9cbea344def