tree 610ea8a2bbc3dbfb7e661fbdbce7fb5af5375d50
parent a5f601fd1b1278deae5aa9fc27a232b0d1c1c788
parent 3deca9d44767efd1b83f4b701f0dbf21a7595f7b
author Wolfgang Denk <wd@denx.de> 1196114273 +0100
committer Wolfgang Denk <wd@denx.de> 1196114273 +0100

Merge commit '3deca9d'

Conflicts:

	Makefile

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