]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.git/commitdiff
Merge branch 'perfcounters/core' into auto-perfcounters-next
authorIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 07:04:55 +0000 (09:04 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 07:04:55 +0000 (09:04 +0200)
1  2 
MAINTAINERS
arch/x86/kernel/cpu/common.c
fs/exec.c
kernel/sched.c
kernel/sysctl.c
mm/mmap.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
diff --cc mm/mmap.c
Simple merge