From: Stefano Babic <sbabic@denx.de>
Date: Mon, 11 Aug 2014 08:21:03 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: KARO-TXA5-2015-06-26~760^2~23
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=e82abaeb7f2a0833fccf90460c48b9f2100258f8

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

Conflicts:
	boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>
---

e82abaeb7f2a0833fccf90460c48b9f2100258f8