diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-06-06 17:00:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 17:22:57 +0200 |
| commit | ff1f74fdcf1881b6c008463c34e9e2a93abe117a (patch) | |
| tree | 234f3bd33f6e6a74943be59211400a53da8d14bf /kernel/sysctl_binary.c | |
| parent | perf/x86: Update SNB PEBS constraints (diff) | |
| parent | perf/x86: Check user address explicitly in copy_from_user_nmi() (diff) | |
Merge branch 'perf/urgent' into perf/core
Eliminate a conflict in a patch I am going to apply.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sysctl_binary.c')
0 files changed, 0 insertions, 0 deletions