tree 295c75b0d9f3c7180f23ec131442286cf91db5b1
parent e62d5fb0da76ef168e90cae9bbbda80349aaf137
parent 8467faef7fce8c5faad7224b7737a58e16c52186
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1378372526 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1378372526 +0200

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

Conflicts:
	drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.