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: 18e69a3 388b82f)

author	Bartlomiej Sieka <tur@semihalf.com>
	Wed, 26 Mar 2008 08:38:06 +0000 (09:38 +0100)
committer	Bartlomiej Sieka <tur@semihalf.com>
	Wed, 26 Mar 2008 08:38:06 +0000 (09:38 +0100)
commit	27f33e9f45ef7f9685cbdc65066a1828e85dde4f
tree	5828044d71e5caa3bec4d05c6c48793df0cd17a3	tree \| snapshot
parent	18e69a35efbb078403db0c0063986470dad7d082	commit \| diff
parent	388b82fddc7c05596f3f615f190da0448227dc82	commit \| diff

Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

Conflicts:

common/cmd_bootm.c
cpu/mpc8xx/cpu.c

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
board/cray/L1/L1.c	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	diff1 \|	diff2 \|	blob \| history
cpu/mpc5xxx/cpu.c	diff1 \|	diff2 \|	blob \| history
fs/cramfs/uncompress.c	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
libfdt/fdt.c	diff1 \|	diff2 \|	blob \| history
libfdt/fdt_ro.c	diff1 \|	diff2 \|	blob \| history
libfdt/fdt_rw.c	diff1 \|	diff2 \|	blob \| history

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