Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:23:13 +0000 (14:23 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile
README
net/eth.c

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc net/eth.c
Simple merge