From: Tom Rini <trini@konsulko.com>
Date: Mon, 20 Jul 2015 21:12:52 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2015.10-rc1~183
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b217c89e8565ade3aaa9f74c33c93236bf151187;p=oweals%2Fu-boot.git

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

b217c89e8565ade3aaa9f74c33c93236bf151187