git.dujemihanovic.xyz Git - u-boot.git/commit

]> git.dujemihanovic.xyz Git - u-boot.git/commit

projects / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 63f347e 2c072c9)

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 25 Mar 2014 09:25:14 +0000 (10:25 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 25 Mar 2014 09:53:15 +0000 (10:53 +0100)
commit	ab6423cae0323e8db2c8fdd0a99138d93fde2137
tree	a97493753a119e577161a4fb0b40b8edfc3923bb	tree \| snapshot
parent	63f347ec4ca94e3b57c6c719e4acaec81b61dc7a	commit \| diff
parent	2c072c958bb544c72f0e848375803dbd6971f022	commit \| diff

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
board/samsung/common/board.c

board/samsung/common/board.c	diff1 \|	diff2 \|	blob \| history
board/samsung/smdk5250/exynos5-dt.c	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	diff1 \|	diff2 \|	blob \| history

My U-Boot fork