| commit | 44347d947f628060b92449702071bfe1d31dfb75 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu May 07 11:17:13 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu May 07 11:17:34 2009 +0200 |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 [diff] | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 [diff] |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>