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)
commitd87f69a16eb2cb96459117b06949a560679002e4
treebbb55b2bd2b6c9e8bd4067aa3279783cb6bd9028
parent124ba9403318d834ef21bcd899c22c870708d2c4
parent384703b8e6cd4c8ef08512e596024e028c91c339
Merge commit 'v3.2-rc6' into perf/core

Merge reason: Update with the latest fixes.

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