From: Tom Rini <trini@ti.com>
Date: Mon, 20 Oct 2014 22:17:26 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2015.01-rc1~217
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a84c8107d9b050fe8a31220d28588abfc2d99aee;p=oweals%2Fu-boot.git

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

a84c8107d9b050fe8a31220d28588abfc2d99aee