Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 8 Jun 2013 12:35:10 +0000 (14:35 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 8 Jun 2013 12:35:10 +0000 (14:35 +0200)
commit10e167329b029890a4c704f094822da5f259b886
treec0950b7cb928ee26b07c39348e4539602ce3aec9
parentdbc000bfb51eb30d786521e6b8e29048c36cbefa
parent4a1c7b13ae104d4526d3176793b7f6b06694df15
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
drivers/serial/Makefile
MAINTAINERS
Makefile
boards.cfg
drivers/serial/Makefile
drivers/watchdog/Makefile
tools/Makefile