summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/zylonite-wm97xx.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-17 03:11:14 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-17 03:11:14 +0300
commit4f3f9573b62be8953ac3d9888c253e0744af7195 (patch)
tree629f1835b61b39ee031c0c8fa18f5038f61478eb /drivers/input/touchscreen/zylonite-wm97xx.c
parent045ce743498881b39e672da948c210c769209515 (diff)
parente79b202c632f24f49f2eb9459b88b5fd9e332263 (diff)
downloadlinux-4f3f9573b62be8953ac3d9888c253e0744af7195.tar.xz
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd: "Just one revert for Armada XP devices: the conversion to of_clk_get_parent_name() wasn't a direct translation, so we revert back to of_clk_get() + __clk_get_name(). We could make of_clk_get_parent_name() more robust, but that may have unintended side-effects, so we'll do that in the next version" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
Diffstat (limited to 'drivers/input/touchscreen/zylonite-wm97xx.c')
0 files changed, 0 insertions, 0 deletions