tree 21521ea036a6339414051ba8fc37106fbcdcc1d3
parent 1b72458be7f6d8885eaef210aeaa1bb72cba3935
parent 091749ddbb1878d68c492063f3b60d0e54df7ff9
author Wolfgang Denk <wd@denx.de> 1220475355 +0200
committer Wolfgang Denk <wd@denx.de> 1220475355 +0200

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

Conflicts:

	board/esd/dasa_sim/dasa_sim.c

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