git.maquefel.me Git - linux.git/commit

author	Frederic Weisbecker <fweisbec@gmail.com>
	Sat, 27 Feb 2010 15:18:46 +0000 (16:18 +0100)
committer	Frederic Weisbecker <fweisbec@gmail.com>
	Sat, 27 Feb 2010 15:18:46 +0000 (16:18 +0100)
commit	018cbffe6819f6f8db20a0a3acd9bab9bfd667e4
tree	fadde2521591998dc653fa094c636e8a547e620d	tree \| snapshot
parent	1dd2980d990068e20045b90c424518cc7f3657ff	commit \| diff
parent	60b341b778cc2929df16c0a504c91621b3c6a4ad	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-event.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

arch/x86/kernel/hw_breakpoint.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-event.c	diff1 \|	diff2 \|	blob \| history