Albert ARIBAUD 10e167329b Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' ... Conflicts: drivers/serial/Makefile		2013-06-08 14:35:10 +02:00
..
nitrogen6x	Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'	2013-06-08 14:35:10 +02:00