Merge commit 'remotes/wd/master'

diff --combined MAKEALL
index 218cb40,20ef4e1..640f3a5
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -342,7 -342,6 +342,7 @@@ LIST_85xx="                
  #########################################################################
  
  LIST_86xx="           \
 +      MPC8610HPCD     \
        MPC8641HPCN     \
        sbc8641d        \
  "
@@@ -555,6 -554,7 +555,7 @@@ LIST_mips5kc_el="
  
  LIST_au1xx0_el="      \
        dbau1550_el     \
+       pb1000          \
  "
  
  LIST_mips_el="                        \

diff --combined Makefile
index 97ff5d6,ac4b430..0c41736
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 1
  PATCHLEVEL = 3
  SUBLEVEL = 0
- EXTRAVERSION = -rc3
+ EXTRAVERSION =
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -1989,9 -1989,6 +1989,9 @@@ TQM8560_config:         unconfi
  ## MPC86xx Systems
  #########################################################################
  
 +MPC8610HPCD_config:   unconfig
 +      @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8610hpcd freescale
 +
  MPC8641HPCN_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale