From: Marek Vasut <marex@denx.de>
Date: Wed, 14 May 2014 22:20:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'u-boot/master' into test
X-Git-Tag: v2014.07-rc2~10^2~7
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8

Merge remote-tracking branch 'u-boot/master' into test
---

4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8