tree 29649f48b92b92342183f71565c34afeca0b1735
parent 79bbde0599d141d7309bedd76d7822832515e16f
parent 1eb7495511b07d79975dc9eef19cdfb40cc169a4
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1396941908 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1396941908 +0200

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