diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 14:23:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 14:23:40 -0800 |
| commit | 4b3415c9363f828e7f1e45edecb57930849d5d5b (patch) | |
| tree | e345592c2babcb2ce1c6cc28055b294cf553fa28 /drivers/pinctrl/pinctrl-rockchip.c | |
| parent | e0b21800107edbf73385a48275c1fd5a9ecaa4db (diff) | |
| parent | 7ecd0bde5bfea524a843ad8fa8cb66ccbce68779 (diff) | |
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 <olof@lixom.net>
Diffstat (limited to 'drivers/pinctrl/pinctrl-rockchip.c')
0 files changed, 0 insertions, 0 deletions