| commit | be750231ce1599b86fbba213e3da8344ece262e2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Aug 15 12:06:12 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Aug 15 12:06:12 2009 +0200 |
| tree | a506c461082692bb5bab8b9bb63a762816329454 | |
| parent | 18408ddc01136f505ae357c03f0d8e50b10e0db6 [diff] | |
| parent | 39e6dd73502f64e2ae3236b304e160ae30de9384 [diff] |
Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
kernel/perf_counter.c
Merge reason: update to latest upstream (-rc6) and resolve
the conflict with urgent fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>