| commit | bb3c3e807140816b5f5fd4840473ee52a916ad4f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Oct 17 09:58:25 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Oct 17 09:58:25 2009 +0200 |
| tree | 9e8a69d266a7df86ca16177eefffab4b4e910753 | |
| parent | 595c36490deb49381dc51231a3d5e6b66786ed27 [diff] | |
| parent | 012abeea669ea49636cf952d13298bb68654146a [diff] |
Merge commit 'v2.6.32-rc5' into perf/probes Conflicts: kernel/trace/trace_event_profile.c Merge reason: update to -rc5 and resolve conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>