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 /kernel/trace/trace_stack.c | |
| parent | 391e3903e63781debc52a0de73f2e922dcc3f602 (diff) | |
| parent | 9ffe29d780dd5f9c662f2c32f8dc64435da726bf (diff) | |
Merge branch 'clk-next-unregister' into clk-next
Conflicts:
drivers/clk/clk.c
Diffstat (limited to 'kernel/trace/trace_stack.c')
0 files changed, 0 insertions, 0 deletions