From: Tom Rini <trini@ti.com>
Date: Thu, 11 Dec 2014 23:28:09 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: KARO-TXA5-2015-06-26~158
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=2c49323d5de38e119f102fa3f5fb291c4bc4e8a0

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

2c49323d5de38e119f102fa3f5fb291c4bc4e8a0