Merge remote branch 'u-boot-avr32/master'

diff --combined MAINTAINERS
index cc887627438090b8a40c09e669cd4843b2240fa8,2d8fd58d15b1791b003a0a4246ccdca88713d382..d608a6bac2296ccc50c9ffcdc60c1b79c9e74195
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -204,10 -204,6 +204,10 @@@ Klaus Heydeck <heydeck@kieback-peter.de
        KUP4K                   MPC855
        KUP4X                   MPC859
  
 +Gary Jennejohn <garyj@denx.de>
 +
 +      quad100hd               PPC405EP
 +
  Murray Jensen <Murray.Jensen@csiro.au>
  
        cogent_mpc8xx           MPC8xx
@@@ -699,6 -695,7 +699,7 @@@ Haavard Skinnemoen <hskinnemoen@atmel.c
        ATSTK1002               AT32AP7000
        ATSTK1003               AT32AP7001
        ATSTK1004               AT32AP7002
+       ATSTK1006               AT32AP7000
        ATNGW100                AT32AP7000
  
  #########################################################################

diff --combined MAKEALL
index 4bf6d4dcd5f53ae4373cf6eeae270ff7b8ea714c,f40de2333a97c4a023b18b0268cf895274f9551e..aad681ffe521b7aaa3f944efa4348915d8dabe68
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -219,7 -219,6 +219,7 @@@ LIST_4xx="         
        PMC405          \
        PMC440          \
        PPChameleonEVB  \
 +      quad100hd       \
        rainier         \
        sbc405          \
        sc3             \
@@@ -698,6 -697,7 +698,7 @@@ LIST_avr32="               
        atstk1002       \
        atstk1003       \
        atstk1004       \
+       atstk1006       \
        atngw100        \
  "
  

diff --combined Makefile
index 04cebacbb9fd4de9786301ca198fbc278976e88e,154e5922a16ddaddfcaf7b12896d3f4c86afa701..543c57bc4df69c199547e7de48ed7412ba91c7c1
--- 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
  
@@@ -2882,6 -2879,9 +2882,9 @@@ atstk1003_config        :       unconfi
  atstk1004_config      :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
  
+ atstk1006_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
  atngw100_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x