From: Tom Rini <trini@ti.com>
Date: Mon, 17 Feb 2014 19:21:03 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nios
X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=b1ad03c242dae3712b9be66026f5d8c6f919c00b;p=u-boot.git

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

b1ad03c242dae3712b9be66026f5d8c6f919c00b