tree 00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0
parent b7f9ee33c83e7f4c4fa9b9ace872b1408b858d34
parent 29a58661a979de57fb8f1c527370fbbbe3313c1b
author Wolfgang Denk <wd@denx.de> 1285709447 +0200
committer Wolfgang Denk <wd@denx.de> 1285709447 +0200

Merge branch 'next' of /home/wd/git/u-boot/next

Conflicts:
	include/ppc4xx.h

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