diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
| commit | be750231ce1599b86fbba213e3da8344ece262e2 (patch) | |
| tree | a506c461082692bb5bab8b9bb63a762816329454 /mm/memory.c | |
| parent | perf tools: Add some comments to the event definitions (diff) | |
| parent | perf record: Fix typo in pid_synthesize_comm_event (diff) | |
| download | linux-be750231ce1599b86fbba213e3da8344ece262e2.tar.xz linux-be750231ce1599b86fbba213e3da8344ece262e2.zip | |
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>
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions