tree 1740a361891d2390631ec053f1bc42e524913b78
parent fe9628c4de5409414881a4c6bacabc00eb6c2420
parent 29bb2ccf16e80308baa65556b458cdbb76498bff
author Wolfgang Denk <wd@denx.de> 1203031612 +0100
committer Wolfgang Denk <wd@denx.de> 1203031612 +0100

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

Conflicts:

	common/cmd_reginfo.c

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