From: Tom Rini <trini@konsulko.com>
Date: Tue, 4 Aug 2015 16:21:45 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2015.10-rc2~424
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e22b1a54942d9003b10564325a34e3cf767556ce;p=oweals%2Fu-boot.git

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

e22b1a54942d9003b10564325a34e3cf767556ce