]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge commit 'v2.6.37' into sched/core
authorIngo Molnar <mingo@elte.hu>
Wed, 5 Jan 2011 13:14:42 +0000 (14:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 5 Jan 2011 13:14:46 +0000 (14:14 +0100)
Merge reason: Merge the final .37 tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/kernel-parameters.txt
include/linux/sched.h
kernel/fork.c
kernel/kthread.c
kernel/sched.c
kernel/watchdog.c

Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge