]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
Merge reason: Add the final .37 tree.

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

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge