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

diff --cc Makefile
Simple merge

diff --cc board/ti/am335x/board.c
Simple merge

diff --cc drivers/mmc/mmc.c
Simple merge

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

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

diff --cc include/configs/exynos5250-dt.h
Simple merge

diff --cc include/fdtdec.h
Simple merge

diff --cc include/mmc.h
index ea198d87b7a3228d8310c49d90f18004e3ac0565,f88f672f111fee172e655167b0284e5b7521774d..583c30e270fa1c4af7af70c089143a8494cdbb78
--- 1/include/mmc.h
--- 2/include/mmc.h
+++ b/include/mmc.h
@@@ -158,10 -163,9 +163,11 @@@
  /*
   * EXT_CSD fields
   */
 +#define EXT_CSD_GP_SIZE_MULT          143     /* R/W */
  #define EXT_CSD_PARTITIONING_SUPPORT  160     /* RO */
 +#define EXT_CSD_RPMB_MULT             168     /* RO */
  #define EXT_CSD_ERASE_GROUP_DEF               175     /* R/W */
+ #define EXT_CSD_BOOT_BUS_WIDTH                177
  #define EXT_CSD_PART_CONF             179     /* R/W */
  #define EXT_CSD_BUS_WIDTH             183     /* R/W */
  #define EXT_CSD_HS_TIMING             185     /* R/W */

diff --cc lib/fdtdec.c
Simple merge