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: 1fd5699 a3bb7bf)

author	Jon Loeliger <jdl@freescale.com>
	Tue, 10 Oct 2006 22:21:42 +0000 (17:21 -0500)
committer	Jon Loeliger <jdl@freescale.com>
	Tue, 10 Oct 2006 22:21:42 +0000 (17:21 -0500)
commit	daaba9859b0b94571dc3e45ad0c26e136426b351
tree	688c9068794d45f78f9347cb47b7fba55a4b10be	tree \| snapshot
parent	1fd5699a4a24f5c1dab1b32f480bace1ebb9fc3e	commit \| diff
parent	a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f	commit \| diff

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

12 files changed:

Makefile	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
common/cmd_bootm.c	diff1 \|	diff2 \|	blob \| history
common/ft_build.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
include/image.h	diff1 \|	diff2 \|	blob \| history
tools/mkimage.c	diff1 \|	diff2 \|	blob \| history

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