]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Merge commit 'v2.6.38-rc5' into sched/core
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 12:31:51 +0000 (13:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 12:31:55 +0000 (13:31 +0100)
Merge reason: Pick up upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/sched_rt.c
kernel/sysctl.c

Simple merge
diff --cc kernel/sysctl.c
Simple merge