Merge git://git.denx.de/u-boot-dm

Conflicts:
	drivers/serial/serial-uclass.c

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc README
Simple merge

diff --cc arch/arm/include/asm/arch-at91/at91sam9260.h
Simple merge

diff --cc common/Makefile
Simple merge

diff --cc common/spl/spl.c
Simple merge

diff --cc drivers/mtd/spi/sandbox.c
Simple merge

diff --cc drivers/serial/serial-uclass.c
index 0f019c8f505bf717fefe0b240d7524d09829f537,cd5324cfa3b398b4fe3d6ccf4d8984d900777d56..b09053f1402bdf55aa3c89abea593ab0bd82d2dd
--- 1/drivers/serial/serial-uclass.c
--- 2/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@@ -19,6 -20,14 +20,11 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
 -/* The currently-selected console serial device */
 -struct udevice *cur_dev __attribute__ ((section(".data")));
 -
+ /*
+  * Table with supported baudrates (defined in config_xyz.h)
+  */
+ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
+ 
  #ifndef CONFIG_SYS_MALLOC_F_LEN
  #error "Serial is required before relocation - define CONFIG_SYS_MALLOC_F_LEN to make this work"
  #endif

diff --cc drivers/spi/spi-uclass.c
Simple merge

diff --cc include/asm-generic/global_data.h
Simple merge

diff --cc lib/fdtdec.c
Simple merge

diff --cc scripts/Makefile.spl
Simple merge