Merge branch 'master' of git://git.denx.de/u-boot-arm into master

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
	arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>

diff --cc Makefile
Simple merge

diff --cc arch/arm/config.mk
Simple merge

diff --cc arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
index 70abfbc,8118767..55510e9
--- 1/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
--- 2/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
@@@ -1,6 -1,6 +1,6 @@@
  SECTION 0x0 BOOTABLE
   TAG LAST
-  LOAD     0x1000     OBJTREE/spl/u-boot-spl.bin
 - LOAD     0x0        spl/u-boot-spl.bin
 - CALL     0x14       0x0
 - LOAD     0x40000100 u-boot.bin
 - CALL     0x40000100 0x0
++ LOAD     0x1000     spl/u-boot-spl.bin
 + CALL     0x1000     0x0
-  LOAD     0x40002000 OBJTREE/u-boot.bin
++ LOAD     0x40002000 u-boot.bin
 + CALL     0x40002000 0x0

diff --cc arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
index e98c97b,ea772f0..bb78cb0
--- 1/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
--- 2/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
@@@ -1,8 -1,8 +1,8 @@@
  SECTION 0x0 BOOTABLE
   TAG LAST
-  LOAD     0x1000     OBJTREE/spl/u-boot-spl.bin
 - LOAD     0x0        spl/u-boot-spl.bin
 - LOAD IVT 0x8000     0x14
++ LOAD     0x1000     spl/u-boot-spl.bin
 + LOAD IVT 0x8000     0x1000
   CALL HAB 0x8000     0x0
-  LOAD     0x40002000 OBJTREE/u-boot.bin
 - LOAD     0x40000100 u-boot.bin
 - LOAD IVT 0x8000     0x40000100
++ LOAD     0x40002000 u-boot.bin
 + LOAD IVT 0x8000     0x40002000
   CALL HAB 0x8000     0x0

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc drivers/misc/Makefile
Simple merge

diff --cc drivers/pci/pcie_imx.c
Simple merge

diff --cc include/configs/m53evk.h
Simple merge

diff --cc include/configs/mx53loco.h
Simple merge

diff --cc include/configs/nitrogen6x.h
Simple merge