| commit | a64d31baed104be25305e9c71585d3ea4ee9a418 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Dec 02 20:09:50 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Dec 02 20:09:50 2008 +0100 |
| tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 | |
| parent | 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed [diff] | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 [diff] |
Merge branch 'linus' into cpus4096 Conflicts: kernel/trace/ring_buffer.c