From: Wolfgang Denk <wd@denx.de>
Date: Sun, 8 Mar 2009 23:41:48 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
X-Git-Tag: v2025.01-rc5-pxa1908~21398
X-Git-Url: http://git.dujemihanovic.xyz/img/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=commitdiff_plain;h=014c595f12d4f7e14cb10188f856465b2d41718f;p=u-boot.git

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

Conflicts:
	lib_ppc/board.c

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

014c595f12d4f7e14cb10188f856465b2d41718f