]> git.baikalelectronics.ru Git - 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)
commit5734203860301cb28032b8b320df35f3042c7dbe
treefadde2521591998dc653fa094c636e8a547e620d
parent72fbefeeb35186663494f5e0bfa01eb84b5d99fd
parentd5421672e4299b107d4a75da787d3700d8be8d67
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