From: Olof Johansson Date: Thu, 19 Jul 2018 22:07:12 +0000 (-0700) Subject: Merge tag 'omap-for-v4.18/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1f9f163500d0a1aaabcd994879e00f48190eb025;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'omap-for-v4.18/fixes-rc5-signed' of git://git./linux/kernel/git/tmlind/linux-omap into fixes One omap dts mismerge fix The dts patch for droid4 PWM vibrator has added gpio6 entries to the wrong node. Let's fix it with a note that there seems to be also other GPIO PWM issues to fix still to get the PWM vibrator working. So this can wait for v4.19 merge cycle if necessary. * tag 'omap-for-v4.18/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap4-droid4: fix dts w.r.t. pwm Signed-off-by: Olof Johansson --- 1f9f163500d0a1aaabcd994879e00f48190eb025