From: Olof Johansson Date: Fri, 23 Jan 2015 22:23:40 +0000 (-0800) Subject: Merge tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu... X-Git-Tag: v3.19-rc6~4^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4b3415c9363f828e7f1e45edecb57930849d5d5b;p=~emulex%2Finfiniband.git Merge tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Merge "ARM: imx: fixes for 3.19, 2nd round" from Shawn Guo: The i.MX fixes for 3.19, 2nd round: - Correct pwm clock assignment in i.MX25 device tree to fix the broken pwm support on i.MX25 * tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx25: Fix PWM "per" clocks Signed-off-by: Olof Johansson --- 4b3415c9363f828e7f1e45edecb57930849d5d5b