From: Tom Rini <trini@konsulko.com>
Date: Fri, 30 Oct 2015 16:56:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2016.01-rc1~152
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=588eec2a8603ee8a8e2e913895767c4c02d523af

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

588eec2a8603ee8a8e2e913895767c4c02d523af