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: f6921e3 30942b1)

author	Wolfgang Denk <wd@denx.de>
	Thu, 14 Feb 2008 23:06:18 +0000 (00:06 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 14 Feb 2008 23:06:18 +0000 (00:06 +0100)
commit	6f99eec3dc2285abfb93631003f7e5cadf2eab0f
tree	1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c	tree \| snapshot
parent	f6921e3dc331293c873ec4d109fd5517a42a90b3	commit \| diff
parent	30942b18b66f35f2ceedab39af10e9eccaa943cc	commit \| diff

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

Conflicts:

Makefile
doc/README.standalone

Signed-off-by: Wolfgang Denk <wd@denx.de>

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
common/cmd_bdinfo.c	diff1 \|	diff2 \|	blob \| history
common/cmd_mem.c	diff1 \|	diff2 \|	blob \| history
config.mk	diff1 \|	diff2 \|	blob \| history
doc/README.standalone	diff1 \|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history

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