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 70abfbc2e5b668690b60229fb681dc622386af83,811876736c22c3471177f01adae7faabe7218073..55510e9cd8fa18474f57fc823ef759c673799970
--- 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 e98c97b63b953f3afca9ff53f7a198209d4c1f9f,ea772f0c869f1819b2099cd7ecc76c0e4b86edb2..bb78cb0c84838041a7f5d97ddd7108bb03f3624e
--- 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