From: Wolfgang Denk <wd@denx.de>
Date: Sun, 2 Mar 2008 20:29:18 +0000 (+0100)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-arm
X-Git-Tag: v2013.04~6191
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2f6e76d23ced547a7f752abd4a753e7787559775;p=bsp%2Fu-boot.git

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

Conflicts:

	include/asm-arm/arch-imx/imx-regs.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

2f6e76d23ced547a7f752abd4a753e7787559775