tree 5acdfb4c2b87058d132dc8fe9fb81d394cb034bd
parent d45f81a1c5f92b1e365a19144fc331a26290c971
parent 9c31901ff749957143ea79e79099091f4eae0cb6
author Wolfgang Denk <wd@denx.de> 1220919891 +0200
committer Wolfgang Denk <wd@denx.de> 1220919891 +0200

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

Conflicts:

	Makefile

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