Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Apr 2010 09:10:28 +0000 (11:10 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Apr 2010 09:10:30 +0000 (11:10 +0200)
commit70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e
tree34b09a49228f0949ff49dce66a433b0dfd83a2dc
parent6eca8cc35b50af1037bc919106dd6dd332c959c2
parentd5a30458a90597915977f06e79406b664a41b8ac
Merge branch 'linus' into perf/core

Merge reason: merge the latest fixes, update to latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
MAINTAINERS
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
kernel/sched.c