Merge with /home/sr/git/u-boot/denx-alpr-merge-test
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 27 Nov 2006 22:11:18 +0000 (23:11 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 27 Nov 2006 22:11:18 +0000 (23:11 +0100)
commitd2c83f549378fb3fc34cb3c2e62fd772fbf8b68b
treef00383ed01ca18fa0beee4930ebb7f3dc4153e5e
parent4f4b602ec7524a032bdf3c6d28c7f525a4a67eaa
parent1729b92cde575476684bffe819d0b7791b57bff2
Merge ... /home/sr/git/u-boot/denx-alpr-merge-test
CHANGELOG
cpu/ppc4xx/4xx_enet.c
drivers/nand/nand_base.c