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

Conflicts:
	drivers/serial/serial_lh7a40x.c

Signed-off-by: Tom Rini <trini@ti.com>

diff --combined MAINTAINERS
index ff8e47c,c0fff0e..1b2da94
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -214,7 -214,9 +214,7 @@@ Siddarth Gore <gores@marvell.com
  Paul Gortmaker <paul.gortmaker@windriver.com>
  
        sbc8349         MPC8349
 -      sbc8540         MPC8540
        sbc8548         MPC8548
 -      sbc8560         MPC8560
        sbc8641d        MPC8641D
  
  Frank Gottschling <fgottschling@eltec.de>
@@@ -583,6 -585,10 +583,10 @@@ Stefano Babic <sbabic@denx.de
        twister         omap3
        vision2         i.MX51
  
+ Lukasz Dalek <luk0104@gmail.com>
+ 
+       h2200           xscale/pxa
+ 
  Jason Liu <r64343@freescale.com>
  
        mx53evk         i.MX53

diff --combined boards.cfg
index df62251,d467f56..83e7084
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -295,6 -295,7 +295,7 @@@ dvlhost                      ar
  pdnb3                        arm         ixp         pdnb3               prodrive
  scpu                         arm         ixp         pdnb3               prodrive       -           pdnb3:SCPU
  balloon3                     arm         pxa
+ h2200                        arm         pxa
  lubbock                      arm         pxa
  palmld                       arm         pxa
  palmtc                       arm         pxa
@@@ -404,8 -405,6 +405,8 @@@ M5485HFE                m68k        mcf547x_8x  
  microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
  qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips:SYS_BIG_ENDIAN
  qemu_mipsel                  mips        mips32      qemu-mips           -              -           qemu-mips:SYS_LITTLE_ENDIAN
 +qemu_mips64                  mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_BIG_ENDIAN
 +qemu_mips64el                mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_LITTLE_ENDIAN
  vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
  vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
  vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
@@@ -546,6 -545,7 +547,6 @@@ Alaska8220                   powerp
  sorcery                      powerpc     mpc8220
  Yukon8220                    powerpc     mpc8220     alaska
  A3000                        powerpc     mpc824x     a3000
 -BMW                          powerpc     mpc824x     bmw
  CPC45                        powerpc     mpc824x     cpc45               -              -           CPC45
  CPC45_ROMBOOT                powerpc     mpc824x     cpc45               -              -           CPC45:BOOT_ROM
  CU824                        powerpc     mpc824x     cu824
@@@ -682,11 -682,17 +683,11 @@@ suvd3                        powerp
  tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
  tuxx1                        powerpc     mpc83xx     km83xx              keymile
  kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
 -sbc8540                      powerpc     mpc85xx     sbc8560             -              -           SBC8540
 -sbc8540_33                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
 -sbc8540_66                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
  sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
  sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
  sbc8548_PCI_33_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33,PCIE
  sbc8548_PCI_66               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,66
  sbc8548_PCI_66_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,66,PCIE
 -sbc8560                      powerpc     mpc85xx     sbc8560             -              -           sbc8560
 -sbc8560_33                   powerpc     mpc85xx     sbc8560             -              -           sbc8560
 -sbc8560_66                   powerpc     mpc85xx     sbc8560             -              -           sbc8560
  socrates                     powerpc     mpc85xx     socrates
  HWW1U1A                      powerpc     mpc85xx     hww1u1a             exmeritus
  MPC8536DS                    powerpc     mpc85xx     mpc8536ds           freescale      -           MPC8536DS