Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

arch/arm/include/asm/arch-at91/at91_pmc.h

arch/arm/include/asm/arch-at91/at91_rstc.h

board/atmel/at91sam9n12ek/at91sam9n12ek.c

drivers/net/macb.c

drivers/net/macb.h

drivers/usb/host/ohci-at91.c

include/configs/afeb9260.h

include/configs/at91rm9200ek.h

include/configs/at91sam9260ek.h

include/configs/at91sam9261ek.h

include/configs/at91sam9263ek.h

include/configs/at91sam9n12ek.h

include/configs/at91sam9x5ek.h

include/configs/cpu9260.h

include/configs/cpuat91.h

include/configs/eb_cpux9k2.h

include/configs/ethernut5.h

include/configs/meesc.h

include/configs/otc570.h

include/configs/pm9261.h