From: Tom Rini <trini@konsulko.com>
Date: Mon, 7 Dec 2015 02:53:18 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-nios
X-Git-Tag: v2025.01-rc5-pxa1908~10907
X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=25ef4bea59dadbd25dec1dbb376ed84dfc735f02;p=u-boot.git

Merge git://git.denx.de/u-boot-nios
---

25ef4bea59dadbd25dec1dbb376ed84dfc735f02