tree c0950b7cb928ee26b07c39348e4539602ce3aec9
parent dbc000bfb51eb30d786521e6b8e29048c36cbefa
parent 4a1c7b13ae104d4526d3176793b7f6b06694df15
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