| commit | 74bf3cabc306f31ddd02f2c1b0540a6cfcacc593 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Dec 02 09:20:29 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Dec 02 09:20:29 2008 +0100 |
| tree | c9f2997a7266cc5d8c5b61e964d8e014f274f5d3 | |
| parent | c7cc77307669336a08928ab8668bdb3f3bcc021b [diff] | |
| parent | 4f5a7f40ddbae98569acbb99118a98570315579c [diff] |
Merge branch 'tracing/urgent' into tracing/core Conflicts: kernel/trace/ring_buffer.c