From: Tom Rini <trini@ti.com>
Date: Wed, 31 Dec 2014 20:10:36 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-usb
X-Git-Tag: KARO-TXA5-2015-06-26~124
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331;hp=-c

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

Conflicts:
	include/configs/arndale.h

Signed-off-by: Tom Rini <trini@ti.com>
---

b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331