From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 5 Sep 2013 09:15:26 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.10-rc3~8^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19d829fa60fc4e6df514a046142faaaf9fc8185d;p=u-boot

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.
---

19d829fa60fc4e6df514a046142faaaf9fc8185d
diff --cc drivers/serial/serial.c
index 118fbc305c,336ff35721..35dc61e020
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@@ -159,7 -159,7 +159,8 @@@ serial_initfunc(pl01x_serial_initialize
  serial_initfunc(s3c44b0_serial_initialize);
  serial_initfunc(sa1100_serial_initialize);
  serial_initfunc(sh_serial_initialize);
 +serial_initfunc(arm_dcc_initialize);
+ serial_initfunc(mxs_auart_initialize);
  
  /**
   * serial_register() - Register serial driver with serial driver core
@@@ -252,7 -252,7 +253,8 @@@ void serial_initialize(void
  	s3c44b0_serial_initialize();
  	sa1100_serial_initialize();
  	sh_serial_initialize();
 +	arm_dcc_initialize();
+ 	mxs_auart_initialize();
  
  	serial_assign(default_serial_console()->name);
  }