git.ipfire.org Git - u-boot.git/commit

]> git.ipfire.org Git - u-boot.git/commit

projects / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5a56af3 5dc210d)

author	Andy Fleming <afleming@freescale.com>
	Fri, 3 Aug 2007 07:23:23 +0000 (02:23 -0500)
committer	Andrew Fleming-AFLEMING <afleming@freescale.com>
	Fri, 3 Aug 2007 07:23:23 +0000 (02:23 -0500)
commit	6bf6f114dcdd97ec3f80c2761ed40e31229d6b78
tree	4bc9e1362c3090bb6d2df71109228ca61b8d00ce	tree \| snapshot
parent	5a56af3b522ba47fb33a3fee84d23bf1e5429654	commit \| diff
parent	5dc210dec5bace98a50b6ba905347890091a9bb0	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
common/cmd_doc.c	diff1 \|	diff2 \|	blob \| history
common/cmd_ide.c	diff1 \|	diff2 \|	blob \| history
common/cmd_nand.c	diff1 \|	diff2 \|	blob \| history
common/cmd_net.c	diff1 \|	diff2 \|	blob \| history
common/cmd_reiser.c	diff1 \|	diff2 \|	blob \| history
disk/part.c	diff1 \|	diff2 \|	blob \| history
drivers/tsec.c	diff1 \|	diff2 \|	blob \| history
fs/fat/fat.c	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8540ADS.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8560ADS.h	diff1 \|	diff2 \|	blob \| history
include/configs/lwmon5.h	diff1 \|	diff2 \|	blob \| history
include/configs/pcs440ep.h	diff1 \|	diff2 \|	blob \| history
include/configs/sequoia.h	diff1 \|	diff2 \|	blob \| history
include/configs/stxssa.h	diff1 \|	diff2 \|	blob \| history
lib_ppc/board.c	diff1 \|	diff2 \|	blob \| history
net/eth.c	diff1 \|	diff2 \|	blob \| history

"Das U-Boot" Source Tree