Merge commit 'v2.6.37' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 5 Jan 2011 13:22:08 +0000 (14:22 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 5 Jan 2011 13:22:10 +0000 (14:22 +0100)
commitaef1b9cef78ae65c6501850851cc3f61f9be477b
tree9769972983e84620df17c13b73f70a8341c4b125
parent20c457b8587bee4644d998331d9e13be82e05b4c
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Merge commit 'v2.6.37' into perf/core

Merge reason: Add the final .37 tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/oprofile/op_model_amd.c
kernel/watchdog.c
tools/perf/util/hist.c