Merge remote-tracking branch 'arm-soc/at91/base2+cleanup' into cleanup-base