tree 29649f48b92b92342183f71565c34afeca0b1735
parent c71645ad2bd5179ad21e2501c26f574e9688f02a
parent 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59
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