From: Olof Johansson Date: Fri, 25 May 2018 11:51:58 +0000 (-0700) Subject: Merge tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.18-rc1~51^2^2~7 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3b4fa7f9093988b136e4c8a4e72f81ea60b34420;p=linux.git Merge tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/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 --- 3b4fa7f9093988b136e4c8a4e72f81ea60b34420