Merge tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
authorOlof Johansson <olof@lixom.net>
Fri, 23 Jan 2015 22:23:40 +0000 (14:23 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 23 Jan 2015 22:23:40 +0000 (14:23 -0800)
commit4b3415c9363f828e7f1e45edecb57930849d5d5b
treee345592c2babcb2ce1c6cc28055b294cf553fa28
parente0b21800107edbf73385a48275c1fd5a9ecaa4db
parent7ecd0bde5bfea524a843ad8fa8cb66ccbce68779
Merge tag 'imx-fixes-3.19-2' of git://git./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 <olof@lixom.net>