]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3287681 1e3e7a9)
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)
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>
1  2 
arch/arm/configs/multi_v7_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge
local clone of linux.git