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: e825b10 d782c1f)

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 11 May 2013 07:25:36 +0000 (09:25 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 11 May 2013 07:25:36 +0000 (09:25 +0200)
commit	ec7023db8dc95966919589541f1ca09355a3f7a5
tree	69be08a0b3f19e3e1d99ea7829931f8f800a01d9	tree \| snapshot
parent	e825b100d209a9d3c79b2998452cafa94eec986a	commit \| diff
parent	d782c1fe7246301143ed78c0d86ea6c81f9325f9	commit \| diff

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

Conflicts:
drivers/mtd/nand/mxc_nand_spl.c
include/configs/m28evk.h

Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/mxc_nand_spl.c	diff1 \|	diff2 \|	blob \| history
include/configs/m28evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx28evk.h	diff1 \|	diff2 \|	blob \| history

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