diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 04:04:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 04:04:25 -0500 |
| commit | 9676e73a9e0cbdc521e1ebf4e13e6e5aada34247 (patch) | |
| tree | b5ea1cace6c4f2f57fcebfc42418b7f53fee84e5 /drivers/net/smc-ultra.c | |
| parent | 5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371 (diff) | |
| parent | 86fa2f60674540df0b34f5c547ed0c1cf3a8f212 (diff) | |
| parent | 6d5b43a67accf6793ed259f6534b4bd53b1e5696 (diff) | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ftrace.c
[ We conflicted here because we backported a few fixes to
tracing/urgent - which has different internal APIs. ]