Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 9 Dec 2008 00:00:24 +0000 (01:00 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 9 Dec 2008 00:00:24 +0000 (01:00 +0100)
1  2 
net/net.c

diff --cc net/net.c
Simple merge