Merge remote branch 'u-boot-at91/for-1.3.4'