git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b440d0e aeec782)

author	Jon Loeliger <jdl@freescale.com>
	Tue, 19 Sep 2006 13:51:24 +0000 (08:51 -0500)
committer	Jon Loeliger <jdl@freescale.com>
	Tue, 19 Sep 2006 13:51:24 +0000 (08:51 -0500)
commit	afa98843e4665add11b69496341053b268156e3a
tree	116878b6b94920a5f282d0a16e4b9ad9dfaf57ff	tree \| snapshot
parent	b440d0ef72e6278973d3220c10136a4c0624c286	commit \| diff
parent	aeec782b020930732eab075af97212c3f03afcae	commit \| diff

Merge branch 'master' of http://www.denx.de/git/u-boot

Conflicts:

board/stxxtc/Makefile

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
board/cds/mpc8541cds/Makefile	diff1 \|	diff2 \|	blob \| history
board/cds/mpc8548cds/Makefile	diff1 \|	diff2 \|	blob \| history
board/cds/mpc8555cds/Makefile	diff1 \|	diff2 \|	blob \| history
board/stxxtc/Makefile	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/u-boot.h	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
lib_ppc/board.c	diff1 \|	diff2 \|	blob \| history
tools/mkimage.c	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git