From: Tom Rini <trini@ti.com>
Date: Sat, 8 Nov 2014 01:35:20 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: KARO-TXA5-2015-06-26~320
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=2db8c2d61a05bb4a94bb341329c6de811757c111

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

2db8c2d61a05bb4a94bb341329c6de811757c111