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: v2016.01-rc2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25ef4bea59dadbd25dec1dbb376ed84dfc735f02;p=platform%2Fkernel%2Fu-boot.git

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

25ef4bea59dadbd25dec1dbb376ed84dfc735f02