Merge tag 'at91-4.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...

AT91 defconfig for 4.20

 - addition of sama5 I2S
 - addition of generic ADC resistive touchscreen

* tag 'at91-4.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: multi_v7_defconfig: add Atmel I2S driver
  ARM: configs: at91: Add I2S driver to sama5
  ARM: multi_v7_defconfig: add generic resistive touchscreen
  ARM: configs: at91: add generic resistive touchscreen to sama5

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge