Merge with /home/sr/git/u-boot/4xx-enet
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 27 Nov 2006 21:50:25 +0000 (22:50 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 27 Nov 2006 21:50:25 +0000 (22:50 +0100)

Trivial merge