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

diff --combined MAINTAINERS
index 4e557af57d93d2d9c5d5650f9c8ddaeb25b4bef6,62b013f744c33eb76ff23085bca8d34501e43d05..b57140036e5b85a0ab10c4ed31c28805ea03e292
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -78,6 -78,10 +78,6 @@@ Holger Brunck <holger.brunck@keymile.co
        tuge1           MPC8321
        tuxx1           MPC8321
  
 -Cyril Chemparathy <cyril@ti.com>
 -
 -      tnetv107x_evm   tnetv107x
 -
  Conn Clark <clark@esteem.com>
  
        ESTEEM192E      MPC8xx
@@@ -363,10 -367,6 +363,10 @@@ Frank Panno <fpanno@delphintech.com
  
        ep8260          MPC8260
  
 +Chan-Taek Park <c-park@ti.com>
 +
 +      tnetv107x_evm   tnetv107x
 +
  Denis Peter <d.peter@mpl.ch>
  
        MIP405          PPC4xx
@@@ -401,6 -401,8 +401,6 @@@ Stefan Roese <sr@denx.de
  
        uc100           MPC857
  
 -      TQM85xx         MPC8540/8541/8555/8560
 -
        acadia          PPC405EZ
        alpr            PPC440GX
        bamboo          PPC440EP
@@@ -729,7 -731,7 +729,7 @@@ Chander Kashyap <k.chander@samsung.com
        SMDKV310                ARM ARMV7 (EXYNOS4210 SoC)
        SMDK5250                ARM ARMV7 (EXYNOS5250 SoC)
  
 -Heungjun Kim <riverful.kim@samsung.com>
 +Lukasz Majewski <l.majewski@samsung.com>
  
        trats                   ARM ARMV7 (EXYNOS4210 SoC)
  
@@@ -1005,6 -1007,7 +1005,7 @@@ Zhong Hongbo <bocui107@gmail.com
        SMDK6400        ARM1176 (S3C6400 SoC)
  
  Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+ Tetsuyuki Kobayashi <koba@kmckk.co.jp>
  
        kzm9g   SH73A0 (RMOBILE SoC)