Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  SMDKV310: Fix incorrect conditional compilation for MIU linear mapping
  SMDKV310: CPU fequency and mmc_pre_ratio modified
  armv7: Add support for ST-Ericsson U8500 href platform
  I2C: Add driver for ST-Ericsson U8500 i2c
  armv7: Add ST-Ericsson u8500 arch
  Kirkwood: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT
  ARMV7: Vexpress: Add missing MMC header
  arm/km: update mgcoge3un board support
  mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE
  arm/km: rename mgcoge2un to mgcoge3un
  arm/km: add second serial interface for kirkwood
  arm/km: disable ls (through jffs2 support)
  arm/km: introduce bootcount env variable and clean km_arm
  arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file
  arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h
  ARMV7: MMC SPL Boot support for SMDKV310 board
  ARMV7: Add support for Samsung SMDKV310 Board
  S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)
  S5P: add set_mmc_clk for external clock control
  S5PC2XX: Support the cpu revision
  S5P:SROM config code moved to s5p-common directory
  Add _end for the end of u-boot image for SMDK6400
  MMC S5P: Fix typo
  S5P: GPIO Macro Values Corrected.
  SMDK2410: various cleanup/code style fixes
  SMDK2410: use the CFI driver (and remove the old one)
  SMDK2410: remove unneeded config.mk
  SMDK2410: activate ARM relocation feature
  BeagleBoard: fixed typo in typecast
  mvsata: issue hard reset on initialization
  VCMA9: use ARM relocation feature to fix build error
  MX31: drop warnings due to missing prototype for mxc_watchdog_reset()
  MX5: drop config.mk from efikamx board
  MX31: Make get_reset_cause() static and drop unreachable code
  MX53: Remove CONFIG_SYS_BOOTMAPSZ from mx53 config files.
  MX53: Handle silicon revision 2.1 case
  mx5: board: code clean up for checkboard code
  MX51: vision2: Fix build for vision2 board.
  MX51: vision: Let video mode struct be independant of watchdog.
  MX53: Add initial support for MX53SMD board.
  MX53: support for freescale MX53LOCO board
  mx5: Fix CONFIG_OF_LIBFDT redefined warning
  mx5: Remove unnecessary CONFIG_SYS_BOOTMAPSZ definition
  mx31pdk: Clean up mx31pdk.h file

diff --combined MAINTAINERS
index 5d110a8cb304aebaaf7c12d71c11383c9613b9ab,96604592228d153c0da3c7f0824b0b434c77c157..c462ae2b71b313f6cf2881a2565216dab7e62d3a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -430,13 -430,10 +430,10 @@@ Heiko Schocher <hs@denx.de
        kmsupx5         MPC8321
        mgcoge          MPC8247
        mgcoge3ne       MPC8247
-       mgcoge2un       ARM926EJS (Kirkwood SoC)
        mucmc52         MPC5200
        muas3001        MPC8270
        municse         MPC5200
        sc3             PPC405GP
-       suen3           ARM926EJS (Kirkwood SoC)
-       suen8           ARM926EJS (Kirkwood SoC)
        suvd3           MPC8321
        tuda1           MPC8321
        tuxa1           MPC8321
@@@ -574,6 -571,7 +571,7 @@@ Stefano Babic <sbabic@denx.de
  Jason Liu <r64343@freescale.com>
  
        mx53evk         i.MX53
+       mx53loco        i.MX53
  
  Enric Balletbo i Serra <eballetbo@iseebcn.com>
  
@@@ -638,7 -636,12 +636,8 @@@ Kristoffer Ericson <kristoffer.ericson@
  Fabio Estevam <fabio.estevam@freescale.com>
  
        mx31pdk         i.MX31
+       mx53smd         i.MX53
  
 -Peter Figuli <peposh@etc.sk>
 -
 -      wepep250        xscale
 -
  Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
  
        meesc           ARM926EJS (AT91SAM9263 SoC)
@@@ -698,6 -701,10 +697,10 @@@ Minkyu Kang <mk7.kang@samsung.com
        s5p_goni                ARM ARMV7 (S5PC110 SoC)
        s5pc210_universal       ARM ARMV7 (S5PC210 SoC)
  
+ Chander Kashyap <k.chander@samsung.com>
+ 
+       SMDKV310                ARM ARMV7 (S5PC210 SoC)
+ 
  Frederik Kriewitz <frederik@kriewitz.eu>
  
        devkit8000      ARM ARMV7 (OMAP3530 SoC)
@@@ -810,6 -817,9 +813,9 @@@ Jens Scharsig <esw@bus-elektronik.de
  Heiko Schocher <hs@denx.de>
  
        magnesium       i.MX27
+       mgcoge3un       ARM926EJS (Kirkwood SoC)
+       suen3           ARM926EJS (Kirkwood SoC)
+       suen8           ARM926EJS (Kirkwood SoC)
  
  Robert Schwebel <r.schwebel@pengutronix.de>