Merge commit 'v2.6.30-rc6' into perfcounters/core
Ingo Molnar [Mon, 18 May 2009 05:37:44 +0000 (07:37 +0200)]
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
              to get the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
MAINTAINERS
arch/x86/kernel/cpu/common.c
drivers/char/sysrq.c
fs/exec.c
include/linux/syscalls.h
kernel/sched.c
kernel/sysctl.c
mm/mmap.c

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