| commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Feb 05 14:33:31 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Feb 05 14:33:31 2009 +0100 |
| tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 | |
| parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 [diff] | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 [diff] |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core