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
..
2013-03-08 16:41:13 -05:00
2013-08-23 15:53:21 +02:00
2009-02-20 03:47:50 +01:00