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
..
2011-01-09 18:06:50 +01:00
2010-07-12 00:14:29 -07:00
2012-05-22 10:18:15 -05:00
2013-04-01 16:33:52 -04:00
2013-04-01 16:33:52 -04:00
2008-05-21 00:14:08 +02:00
2012-11-04 11:00:36 -07:00