tree 5acdfb4c2b87058d132dc8fe9fb81d394cb034bd
parent 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c
parent 5ff889349d2ace13f10c9335e09365fcec8247cc
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>