From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 6 Jan 2014 07:49:58 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.01-rc3~9^2~47
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=a891601ce51edbafa1a2750c96a618e4fcbca1c2

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
	include/micrel.h

The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.
---

a891601ce51edbafa1a2750c96a618e4fcbca1c2