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

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4ce846e 4ef35e5)

author	Stefan Roese <sr@denx.de>
	Tue, 14 Aug 2007 14:36:29 +0000 (16:36 +0200)
committer	Stefan Roese <sr@denx.de>
	Tue, 14 Aug 2007 14:36:29 +0000 (16:36 +0200)
commit	3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae
tree	fb66bf8861d9f78765160d734a438856f5317cdb	tree \| snapshot
parent	4ce846ec59f36b85d6644a769690ad3feb667575	commit \| diff
parent	4ef35e53c693556c54b0c22d6f873de87bade253	commit \| diff

Merge with git://www.denx.de/git/u-boot.git

17 files changed:

CREDITS	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
MAKEALL	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
board/netstal/common/nm_bsp.c	diff1 \|	\|	blob \| history
board/netstal/hcu4/hcu4.c	diff1 \|	\|	blob \| history
cpu/ppc4xx/4xx_enet.c	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/serial.c	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/traps.c	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/usb.c	\|	diff2 \|	blob \| history
include/configs/bamboo.h	diff1 \|	diff2 \|	blob \| history
include/configs/hcu4.h	diff1 \|	\|	blob \| history
include/configs/hcu5.h	diff1 \|	\|	blob \| history
include/configs/luan.h	diff1 \|	diff2 \|	blob \| history
include/configs/lwmon5.h	diff1 \|	diff2 \|	blob \| history
include/configs/taihu.h	diff1 \|	\|	blob \| history
include/configs/zeus.h	diff1 \|	\|	blob \| history

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