tree c0950b7cb928ee26b07c39348e4539602ce3aec9
parent 642a4446c5cd43207582651781b395b11a660269
parent a03908e7edaf8c888eece5945ab5bdb25ef6fd40
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1370694910 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1370694910 +0200

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

Conflicts:
	drivers/serial/Makefile