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

diff --combined MAINTAINERS
index e235884f4e9d68d637c896e83a8da405c1030a50,4b23c8366a310d2af4aabce63422aeb9b657f286..5e3a3faafdc78f92140b2fd1875d1562ace7057f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -501,10 -501,6 +501,10 @@@ Detlev Zundel <dzu@denx.de
  
        inka4x0         MPC5200
  
 +Tirumala Marri <tmarri@apm.com>
 +
 +      bluestone       APM821XX
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -997,6 -993,7 +997,7 @@@ Blackfin Team <u-boot-devel@blackfin.uc
        BF526-EZBRD     BF526
        BF527-EZKIT     BF527
        BF527-EZKIT-V2  BF527
+       BF527-SDP       BF527
        BF533-EZKIT     BF533
        BF533-STAMP     BF533
        BF537-PNAV      BF537
@@@ -1026,9 -1023,12 +1027,12 @@@ Blackfin Team <u-boot-devel@blackfin.uc
        BF537-srv1      BF537
  
  Wojtek Skulski <skulski@pas.rochester.edu>
+ Wojtek Skulski <info@skutek.com>
+ Blackfin Team <u-boot-devel@blackfin.uclinux.org>
  Benjamin Matthews <mben12@gmail.com>
  
-       BLACKSTAMP      BF532
+       BlackStamp      BF533
+       BlackVME        BF561
  
  I-SYST Micromodule <support@i-syst.com>
  Blackfin Team <u-boot-devel@blackfin.uclinux.org>
@@@ -1044,6 -1044,10 +1048,10 @@@ Brent Kandetzki <brentk@teleco.com
  
        IP04            BF532
  
+ Peter Meerwald <devel@bct-electronic.com>
+ 
+       bct-brettl2     BF536
+ 
  #########################################################################
  # End of MAINTAINERS list                                             #
  #########################################################################

diff --combined boards.cfg
index d5d444595776b3db18384cd6b2186ec2f3425d1f,d1a0ac21e86bf568bf2b469b66b85219ca174dcb..99096855ad86a3f067cb73e463040f51d53e8a43
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -93,14 -93,14 +93,14 @@@ PATI               powerpc mpc5xx          pati            mp
  BC3450                powerpc mpc5xxx         bc3450
  canmb         powerpc mpc5xxx
  cm5200                powerpc mpc5xxx
 -hmi1001               powerpc mpc5xxx
 +hmi1001               powerpc mpc5xxx         -               manroland
  inka4x0               powerpc mpc5xxx
  ipek01                powerpc mpc5xxx
  jupiter               powerpc mpc5xxx
 -mucmc52               powerpc mpc5xxx
 +mucmc52               powerpc mpc5xxx         -               manroland
  munices               powerpc mpc5xxx
  o2dnt         powerpc mpc5xxx
 -uc101         powerpc mpc5xxx
 +uc101         powerpc mpc5xxx         -               manroland
  v38b          powerpc mpc5xxx
  pf5200                powerpc mpc5xxx         -               esd
  aev           powerpc mpc5xxx         tqm5200         tqc
@@@ -153,7 -153,7 +153,7 @@@ RBC823             powerpc mpc8xx          rbc82
  rmu           powerpc mpc8xx
  RPXlite               powerpc mpc8xx
  spc1920               powerpc mpc8xx
 -uc100         powerpc mpc8xx
 +uc100         powerpc mpc8xx          -               manroland
  MHPC          powerpc mpc8xx          mhpc            eltec
  TOP860                powerpc mpc8xx          top860          emk
  kmsupx4               powerpc mpc8xx          km8xx           keymile
@@@ -184,7 -184,6 +184,7 @@@ t3corp             powerpc ppc4x
  zeus          powerpc ppc4xx
  acadia                powerpc ppc4xx          -               amcc
  bamboo                powerpc ppc4xx          -               amcc
 +bluestone     powerpc ppc4xx          -               amcc
  bubinga               powerpc ppc4xx          -               amcc
  ebony         powerpc ppc4xx          -               amcc
  katmai                powerpc ppc4xx          -               amcc
@@@ -280,10 -279,12 +280,12 @@@ atstk1004       avr32   at32ap          atstk1000       atme
  atstk1006     avr32   at32ap          atstk1000       atmel           at32ap700x
  favr-32-ezkit avr32   at32ap          -               earthlcd        at32ap700x
  hammerhead    avr32   at32ap          -               miromico        at32ap700x
+ bct-brettl2   blackfin        blackfin
  bf518f-ezbrd  blackfin        blackfin
  bf526-ezbrd   blackfin        blackfin
  bf527-ad7160-eval blackfin    blackfin
  bf527-ezkit   blackfin        blackfin
+ bf527-sdp     blackfin        blackfin
  bf533-ezkit   blackfin        blackfin
  bf533-stamp   blackfin        blackfin
  bf537-minotaur        blackfin        blackfin
@@@ -295,6 -296,7 +297,7 @@@ bf548-ezkit        blackfin        blackfi
  bf561-acvilon blackfin        blackfin
  bf561-ezkit   blackfin        blackfin
  blackstamp    blackfin        blackfin
+ blackvme      blackfin        blackfin
  cm-bf527      blackfin        blackfin
  cm-bf533      blackfin        blackfin
  cm-bf537e     blackfin        blackfin