git.openwrt.org Git - project/bcm63xx/u-boot.git/commit

projects / project / bcm63xx / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b1b54e3 5728be3)

author	Wolfgang Denk <wd@denx.de>
	Sun, 5 Aug 2007 23:11:08 +0000 (01:11 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Sun, 5 Aug 2007 23:11:08 +0000 (01:11 +0200)
commit	f2c2a937d8c4a44f63ff88bf82023e03a29497a2
tree	fa8f7c9fb65d10259e76c40c52cf8277947424d4	tree \| snapshot
parent	b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86	commit \| diff
parent	5728be389e65fd47f34b33c2596271eb4db751ae	commit \| diff

Merge ... /home/wd/git/u-boot/custodian/u-boot-testing

15 files changed:

CHANGELOG	diff1 \|	diff2 \|	blob \| history
MAKEALL	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	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/main.c	diff1 \|	diff2 \|	blob \| history
cpu/mpc5xxx/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/nand_legacy/nand_legacy.c	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
include/configs/pcs440ep.h	diff1 \|	diff2 \|	blob \| history
lib_ppc/board.c	diff1 \|	diff2 \|	blob \| history
net/eth.c	diff1 \|	diff2 \|	blob \| history

Broadcom-s U-Boot