From: Tom Rini <trini@ti.com>
Date: Tue, 16 Dec 2014 14:41:00 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-socfpga
X-Git-Tag: KARO-TXA5-2015-06-26~153
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=3bfbf32b6fe5e2d4605bc7ee99d1844b572662c2

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

3bfbf32b6fe5e2d4605bc7ee99d1844b572662c2