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)

diff --cc arch/x86/kernel/hw_breakpoint.c
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc tools/perf/builtin-top.c
Simple merge

diff --cc tools/perf/util/event.c
Simple merge

diff --cc tools/perf/util/probe-event.c
index 71b0dd5,fde17b0..a21b6bf
--- 1/tools/perf/util/probe-event.c
--- 2/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@@ -493,8 -457,7 +495,9 @@@ void show_perf_probe_events(void
        struct strlist *rawlist;
        struct str_node *ent;
  
 +      setup_pager();
+       memset(&pp, 0, sizeof(pp));
 +
        fd = open_kprobe_events(O_RDONLY, 0);
        rawlist = get_trace_kprobe_event_rawlist(fd);
        close(fd);