Merge remote-tracking branch 'u-boot-atmel/master' into m