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

Conflicts:

	cpu/arm920t/ep93xx/timer.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --combined MAINTAINERS
index 7f40ebd972120f5209a6663b6fda6f7c3c2d98c7,80057ce1eb4631875ff00f4b322571776d72fce8..092ebecc0113d3fca718562c2abb8778f2840d5c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -118,7 -118,6 +118,6 @@@ Wolfgang Denk <wd@denx.de
  
        CU824           MPC8240
        Sandpoint8240   MPC8240
-       SL8245          MPC8245
  
        ATC             MPC8250
        PM825           MPC8250
@@@ -618,10 -617,6 +617,10 @@@ Simon Kagstrom <simon.kagstrom@netinsig
  
         openrd_base     ARM926EJS (Kirkwood SoC)
  
 +Minkyu Kang <mk7.kang@samsung.com>
 +
 +      SMDKC100        ARM CORTEX-A8 (S5PC100 SoC)
 +
  Nishant Kamat <nskamat@ti.com>
  
        omap1610h2      ARM926EJS
@@@ -636,17 -631,17 +635,17 @@@ Sergey Kubushyn <ksi@koi8.net
        SONATA          ARM926EJS
        SCHMOOGIE       ARM926EJS
  
 -Sandeep Paulraj <s-paulraj@ti.com>
 -
 -      davinci_dm355evm        ARM926EJS
 -      davinci_dm355leopard    ARM926EJS
 -      davinci_dm365evm        ARM926EJS
 -      davinci_dm6467evm       ARM926EJS
 -
  Prakash Kumar <prakash@embedx.com>
  
        cerf250         xscale
  
 +Vipin Kumar <vipin.kumar@st.com>
 +
 +      spear300        ARM926EJS (spear300 Soc)
 +      spear310        ARM926EJS (spear310 Soc)
 +      spear320        ARM926EJS (spear320 Soc)
 +      spear600        ARM926EJS (spear600 Soc)
 +
  Sergey Lapin <slapin@ossfans.org>
  
        afeb9260        ARM926EJS (AT91SAM9260 SoC)
@@@ -679,13 -674,6 +678,13 @@@ Kyungmin Park <kyungmin.park@samsung.co
  
        apollon         ARM1136EJS
  
 +Sandeep Paulraj <s-paulraj@ti.com>
 +
 +      davinci_dm355evm        ARM926EJS
 +      davinci_dm355leopard    ARM926EJS
 +      davinci_dm365evm        ARM926EJS
 +      davinci_dm6467evm       ARM926EJS
 +
  Peter Pearse <peter.pearse@arm.com>
        integratorcp    All current ARM supplied & supported core modules
                        -see http://www.arm.com/products/DevTools/Hardware_Platforms.html
@@@ -786,6 -774,10 +785,6 @@@ Alex Züpke <azu@sysgo.de
        lart            SA1100
        dnp1110         SA1110
  
 -Minkyu Kang <mk7.kang@samsung.com>
 -
 -      SMDKC100        ARM CORTEX-A8 (S5PC100 SoC)
 -
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards: