tree 9e796e38d4edeabec4d091ed89d6fe179e84956c
parent 86caca1cd97ba71b7a7c82f2b0163682df35ce5d
parent 1f241263e088a71b8f33f87b03a37c5418d41e2e
author Wolfgang Denk <wd@denx.de> 1276816849 +0200
committer Wolfgang Denk <wd@denx.de> 1276816849 +0200

Merge branch 'master' into next

Conflicts:
	Makefile

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