From: Tom Rini <trini@ti.com>
Date: Fri, 6 Sep 2013 13:37:04 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nios
X-Git-Tag: v2013.10~117
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=938138c70815ce5abd5d61b01d28fbb3d618db48;p=bsp%2Fu-boot.git

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

938138c70815ce5abd5d61b01d28fbb3d618db48