| commit | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 26 09:18:32 2010 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 26 09:18:32 2010 +0100 |
| tree | 2b1052b05fa7615c817894bc9802bc5bb2af7ac1 | |
| parent | 83f0d53993b2967e54186468b0fc4321447f68f1 [diff] | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad [diff] |
Merge commit 'v2.6.33' into tracing/core Conflicts: scripts/recordmcount.pl Merge reason: Merge up to v2.6.33. Signed-off-by: Ingo Molnar <mingo@elte.hu>