Merge commit 'v3.2-rc6' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 19:32:03 +0000 (20:32 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 19:32:11 +0000 (20:32 +0100)
Merge reason: Update with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/kernel-parameters.txt
kernel/events/core.c
kernel/lockdep.c
tools/perf/builtin-stat.c
tools/perf/util/header.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge