Merge branch 'v4.13/defconfig' into davinci-reset