diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:45:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:45:41 -0500 |
| commit | ce70a0b472e06feae3a580ecb3fbef1e1e020a9b (patch) | |
| tree | 46e8a2ef0c91fae86a735ee08add6cd6519ee74f /kernel | |
| parent | 939b366977d29b5c0d53d1ea3b0b8cefb1e76202 (diff) | |
| parent | 79fb0768fbd371f3b94d909f51f587b3a24ab272 (diff) | |
| parent | 229c4ef8ae56d69f8dec64533bf1c7f8070c1a4a (diff) | |
Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus' into tracing/core