| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Nov 11 09:40:18 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Nov 11 09:40:18 2008 +0100 |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e [diff] | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 [diff] |
Merge branch 'tracing/urgent' into tracing/ftrace Conflicts: kernel/trace/trace.c