Merge branch 'master' of http://www.denx.de/git/u-boot
authorJon Loeliger <jdl@freescale.com>
Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
committerJon Loeliger <jdl@freescale.com>
Wed, 7 Jun 2006 13:49:38 +0000 (08:49 -0500)
1  2 
Makefile
include/asm-ppc/processor.h
net/eth.c

diff --cc Makefile
Simple merge
Simple merge
diff --cc net/eth.c
Simple merge