Merge branch 'mimc200' of git://git.denx.de/u-boot-avr32

Conflicts:

	MAKEALL
	Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc MAKEALL
index d7196db7fc22193945a97a6d333dda8ea098d6f0,fcd9310f7c93301bc4feef58c7532576bddfd016..82a84c9d09bba81f0a312c33c7bad0f767b44e67
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -714,8 -714,7 +714,9 @@@ LIST_avr32="               
        atstk1004       \
        atstk1006       \
        atngw100        \
 +      favr-32-ezkit   \
 +      hammerhead      \
+       mimc200         \
  "
  
  #########################################################################

diff --cc Makefile
index 51d49ed34c2d82f51b6d07c8188e59cb70f66837,a74f33b2abf2f91bce7390a279c2d33ce8753b85..fe5bf11553e11e77ddf2e0b9e84f6a366b027b17
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2911,12 -2911,9 +2911,15 @@@ atstk1004_config      :       unconfi
  atstk1006_config      :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
  
 +favr-32-ezkit_config  :       unconfig
 +      @$(MKCONFIG) $(@:_config=) avr32 at32ap favr-32-ezkit earthlcd at32ap700x
 +
 +hammerhead_config     :       unconfig
 +      @$(MKCONFIG) $(@:_config=) avr32 at32ap hammerhead miromico at32ap700x
 +
+ mimc200_config                :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap mimc200 mimc at32ap700x
+ 
  #========================================================================
  # SH3 (SuperH)
  #========================================================================