git.librecmc.org Git - oweals/u-boot.git/commit

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b99c1e6 efa013d)

author	Wolfgang Denk <wd@denx.de>
	Wed, 18 Apr 2007 15:00:09 +0000 (17:00 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 18 Apr 2007 15:00:09 +0000 (17:00 +0200)
commit	43f6226db002af1d1ff1adf35b422dcce9f76f76
tree	c2badee8575584bba24e33f62325e95d812dbc79	tree \| snapshot
parent	b99c1e6d8eec327c4b4dd99bf4c0d1a1eba2ce0a	commit \| diff
parent	efa013df333fb680eedfcad22283083614dad418	commit \| diff

Merge ... /home/wd/git/u-boot/custodian/u-boot-74xx-7xx

MAKEALL	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/44x_spd_ddr2.c	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/start.S	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/global_data.h	diff1 \|	diff2 \|	blob \| history
net/eth.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.