]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge commit 'v2.6.33' into perf/core
authorFrederic Weisbecker <fweisbec@gmail.com>
Sat, 27 Feb 2010 15:18:46 +0000 (16:18 +0100)
committerFrederic Weisbecker <fweisbec@gmail.com>
Sat, 27 Feb 2010 15:18:46 +0000 (16:18 +0100)
commit018cbffe6819f6f8db20a0a3acd9bab9bfd667e4
treefadde2521591998dc653fa094c636e8a547e620d
parent1dd2980d990068e20045b90c424518cc7f3657ff
parent60b341b778cc2929df16c0a504c91621b3c6a4ad
Merge commit 'v2.6.33' into perf/core

Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.

Conflicts:
tools/perf/util/probe-event.c (trivial)
arch/x86/kernel/hw_breakpoint.c
arch/x86/kernel/ptrace.c
include/linux/perf_event.h
kernel/perf_event.c
kernel/sched.c
kernel/trace/trace_kprobe.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/probe-event.c