Merge tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 25 May 2018 11:51:58 +0000 (04:51 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 25 May 2018 11:51:58 +0000 (04:51 -0700)
commit3b4fa7f9093988b136e4c8a4e72f81ea60b34420
tree64e0c84ea62e53258d330bb57e9fe3677829fb5a
parent32876811b4635e3a3c1c93e207f17dee9f5e2ec7
parent1e3e7a9f27dc73c50ad7b0f06e6e519bbaa3fee9
Merge tag 'amlogic-defconfig' of https://git./linux/kernel/git/khilman/linux-amlogic into next/defconfig

Amlogic: defconfig updates for v4.18
- multi_v7_defconfig: enable meson PWM, I2C drivers

* tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: multi_v7_defconfig: enable the Meson PWM controller
  arm: multi_v7_defconfig: enable the Amlogic Meson I2C driver

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/configs/multi_v7_defconfig