Albert ARIBAUD 519fdde9e6 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
2014-04-08 09:25:08 +02:00
..
2014-04-07 23:03:13 +02:00
2014-01-09 16:08:44 +01:00
2014-01-14 12:38:47 +01:00
2014-04-08 00:15:12 +02:00
2014-01-09 16:08:44 +01:00
2014-04-08 00:15:12 +02:00
2014-02-26 21:18:09 +01:00