git.librecmc.org Git - oweals/u-boot.git/commit

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c71645a 04d2f0a)

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 8 Apr 2014 07:25:08 +0000 (09:25 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 8 Apr 2014 07:25:08 +0000 (09:25 +0200)
commit	519fdde9e6a6ebce7dc743b4f5621503d25b7a45
tree	29649f48b92b92342183f71565c34afeca0b1735	tree \| snapshot
parent	c71645ad2bd5179ad21e2501c26f574e9688f02a	commit \| diff
parent	04d2f0a9f33112bd70ce4d9c451fdca1682e3a59	commit \| diff

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

Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h

Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/arm926ejs/mxs/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/imx-common/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/dfu/dfu.c	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_evm.h	diff1 \|	diff2 \|	blob \| history
include/configs/trats.h	diff1 \|	diff2 \|	blob \| history
include/configs/trats2.h	diff1 \|	diff2 \|	blob \| history
include/mmc.h	diff1 \|	diff2 \|	blob \| history
include/sdhci.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.