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

diff --cc MAINTAINERS
Simple merge

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc net/eth.c
index 4a9e1e691b50b5c50238f2d750f9a3141998d4da,f707971753a0c2889516c80f709674bc522513a8..75175ec62b90c8fc1d79f840dfe4c5b806ed256a
--- 1/net/eth.c
--- 2/net/eth.c
+++ b/net/eth.c
@@@ -60,8 -60,8 +60,9 @@@ extern int npe_initialize(bd_t *)
  extern int uec_initialize(int);
  extern int bfin_EMAC_initialize(bd_t *);
  extern int atstk1000_eth_initialize(bd_t *);
+ extern int atngw100_eth_initialize(bd_t *);
  extern int mcffec_initialize(bd_t*);
 +extern int mcdmafec_initialize(bd_t*);
  
  #ifdef CONFIG_API
  extern void (*push_packet)(volatile void *, int);