diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-17 02:11:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-17 02:11:14 +0200 |
| commit | 4f3f9573b62be8953ac3d9888c253e0744af7195 (patch) | |
| tree | 629f1835b61b39ee031c0c8fa18f5038f61478eb /drivers/input/mouse/cyapa_gen6.c | |
| parent | Merge tag 'dm-4.3-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/d... (diff) | |
| parent | Partially revert "clk: mvebu: Convert to clk_hw based provider APIs" (diff) | |
| download | linux-4f3f9573b62be8953ac3d9888c253e0744af7195.tar.xz linux-4f3f9573b62be8953ac3d9888c253e0744af7195.zip | |
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/mouse/cyapa_gen6.c')
0 files changed, 0 insertions, 0 deletions