diff options
| author |   Mike Turquette <mturquette@linaro.org> | 2013-12-31 11:35:12 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-12-31 11:35:12 -0800 |
| commit | dbdf6ff51e3ce13ade5834b0d7d451522fcdb478 (patch) | |
| tree | b5594d70cf4d484101891adbfc01798c14827fa8 /include/linux/timerqueue.h | |
| parent | Merge branch 'for_3.14/keystone-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into clk-next-keystone (diff) | |
| parent | Merge branch 'clk/clk-unregister' of git://linuxtv.org/snawrocki/samsung into clk-next-unregister (diff) | |
Merge branch 'clk-next-unregister' into clk-next
Conflicts:
drivers/clk/clk.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions