diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-02 22:37:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-02 22:37:35 +0100 |
| commit | fdfa66ab455c79d699833c43ac0e09900133fd7c (patch) | |
| tree | 5ede20eaf13eab51c3a391e002a4e9988aa3e787 | |
| parent | 4387d6d6b8a74722bf1f6fc3e29dd2a84cc1d1c2 (diff) | |
| parent | acdb2c287916ce247c09d460266370af45da55c5 (diff) | |
| parent | 340430c572f7b2b275d39965e88bafa71693cb23 (diff) | |
Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core