Merge commit '3deca9d'
authorWolfgang Denk <wd@denx.de>
Mon, 26 Nov 2007 21:57:53 +0000 (22:57 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 26 Nov 2007 21:57:53 +0000 (22:57 +0100)
commit88fed9a120aabd6e0b684e2616cafca58aaa7f93
tree610ea8a2bbc3dbfb7e661fbdbce7fb5af5375d50
parenta5f601fd1b1278deae5aa9fc27a232b0d1c1c788
parent3deca9d44767efd1b83f4b701f0dbf21a7595f7b
Merge commit '3deca9d'

Conflicts:

Makefile

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