Merge branch 'at91/defconfig' into fixes