From: Tom Rini <trini@ti.com>
Date: Thu, 13 Nov 2014 15:35:13 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sunxi
X-Git-Tag: KARO-TXA5-2015-06-26~304
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=0d485b9095328cdc81b2ee94ff59b988c69b9127

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

0d485b9095328cdc81b2ee94ff59b988c69b9127