Merge branch 'master' of /home/stefan/git/u-boot/u-boot

diff --combined MAKEALL
index cdc0011b9b0b48e539530538a60d07411141364d,067406909a277aa6737034ef72cfdfdf5fb81e1c..4bf6d4dcd5f53ae4373cf6eeae270ff7b8ea714c
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -219,7 -219,6 +219,7 @@@ LIST_4xx="         
        PMC405          \
        PMC440          \
        PPChameleonEVB  \
 +      quad100hd       \
        rainier         \
        sbc405          \
        sc3             \
@@@ -355,6 -354,7 +355,7 @@@ LIST_85xx="                
        sbc8540         \
        sbc8548         \
        sbc8560         \
+       socrates        \
        stxgp3          \
        stxssa          \
        TQM8540         \

diff --combined Makefile
index c2f3361e722d2e5ff3ed476c1ffe48298b507806,3401203bad5c3b94e2cd33a2711729a2588ac6e6..04cebacbb9fd4de9786301ca198fbc278976e88e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1391,9 -1391,6 +1391,9 @@@ PPChameleonEVB_HI_33_config:    unconfi
                }
        @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
  
 +quad100hd_config:     unconfig
 +      @$(MKCONFIG) $(@:_config=) ppc ppc4xx quad100hd
 +
  sbc405_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx sbc405
  
@@@ -2211,6 -2208,9 +2211,9 @@@ sbc8560_66_config:      unconfi
        fi
        @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560
  
+ socrates_config:      unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx socrates
+ 
  stxgp3_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3