Albert ARIBAUD 19d829fa60 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.

2013-09-05 11:15:26 +02:00

..

asm

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

2013-09-05 11:15:26 +02:00