diff options
| author | Ingo Molnar | 2011-04-27 10:38:30 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2011-04-27 10:40:21 +0200 |
| commit | 32673822e440eb92eb334631eb0a199d0c532d13 (patch) | |
| tree | c1e55c1793fa17937d9b8e0a9a2946583f1948d5 /arch/sparc/include/asm/syscalls.h | |
| parent | fa7b69475a6c192853949ba496dd9c37b497b548 (diff) | |
| parent | 5373db886b791b2bc7811e2c115377916c409a5d (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts:
include/linux/perf_event.h
Merge reason: pick up the latest jump-label enhancements, they are cooked ready.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/syscalls.h')
0 files changed, 0 insertions, 0 deletions