diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-06-10 17:53:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-06-10 17:53:51 -0400 |
| commit | 3c95290d3fb593145b8ce1163d795a08f05e112c (patch) | |
| tree | e6fc1bea660993e4eaaf5b716bef577d6fbf692e /trace-view-store.c | |
| parent | d01b699fffc573e7653e00d608444735c04f9dca (diff) | |
| parent | b09e5f4f3fc5c8fc2c51376050af19660c8053f4 (diff) | |
Merge branch 'kernelshark-devel' into trace-cmd
Conflicts:
Makefile
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'trace-view-store.c')
| -rw-r--r-- | trace-view-store.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/trace-view-store.c b/trace-view-store.c index ba40aad..6f70ca5 100644 --- a/trace-view-store.c +++ b/trace-view-store.c | |||
| @@ -1330,7 +1330,6 @@ void trace_view_store_assign_filters(TraceViewStore *store, | |||
| 1330 | 1330 | ||
| 1331 | if (store->task_filter != task_filter) | 1331 | if (store->task_filter != task_filter) |
| 1332 | store->task_filter = filter_task_hash_copy(task_filter); | 1332 | store->task_filter = filter_task_hash_copy(task_filter); |
| 1333 | |||
| 1334 | } | 1333 | } |
| 1335 | 1334 | ||
| 1336 | 1335 | ||