]> git.sur5r.net Git - u-boot/commit
Merge branch 'testing' into working
authorAndy Fleming <afleming@freescale.com>
Fri, 3 Aug 2007 07:23:23 +0000 (02:23 -0500)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Fri, 3 Aug 2007 07:23:23 +0000 (02:23 -0500)
commit6bf6f114dcdd97ec3f80c2761ed40e31229d6b78
tree4bc9e1362c3090bb6d2df71109228ca61b8d00ce
parent5a56af3b522ba47fb33a3fee84d23bf1e5429654
parent5dc210dec5bace98a50b6ba905347890091a9bb0
Merge branch 'testing' into working

Conflicts:

CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
19 files changed:
CHANGELOG
Makefile
README
common/cmd_doc.c
common/cmd_ide.c
common/cmd_nand.c
common/cmd_net.c
common/cmd_reiser.c
disk/part.c
drivers/tsec.c
fs/fat/fat.c
include/configs/MPC8540ADS.h
include/configs/MPC8560ADS.h
include/configs/lwmon5.h
include/configs/pcs440ep.h
include/configs/sequoia.h
include/configs/stxssa.h
lib_ppc/board.c
net/eth.c