diff options
| author | Tejun Heo <tj@kernel.org> | 2009-12-08 10:02:12 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-12-08 10:02:12 +0900 |
| commit | 50de1a8ef18da0cfff97543315b4e042e8bb7c83 (patch) | |
| tree | 86056d1aef0e83d7839a8350c9e6109b80b3cfa5 /kernel/trace/trace_functions_graph.c | |
| parent | percpu: make misc percpu symbols unique (diff) | |
| parent | percpu: add missing per_cpu_ptr_to_phys() definition for UP (diff) | |
| download | linux-50de1a8ef18da0cfff97543315b4e042e8bb7c83.tar.gz linux-50de1a8ef18da0cfff97543315b4e042e8bb7c83.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
mm/percpu.c
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
0 files changed, 0 insertions, 0 deletions