Merge commit 'v2.6.29-rc2' into perfcounters/core
Ingo Molnar [Wed, 21 Jan 2009 15:37:27 +0000 (16:37 +0100)]
Conflicts:
include/linux/syscalls.h

16 files changed:
1  2 
arch/powerpc/include/asm/systbl.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/vmlinux.lds.S
arch/powerpc/sysdev/mpic.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/pat.c
drivers/char/sysrq.c
fs/exec.c
include/linux/syscalls.h
init/Kconfig
kernel/Makefile
kernel/exit.c
kernel/fork.c
kernel/sched.c
kernel/sys.c
kernel/sys_ni.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
@@@ -54,7 -54,7 +54,8 @@@ struct compat_stat
  struct compat_timeval;
  struct robust_list_head;
  struct getcpu_cache;
+ struct old_linux_dirent;
 +struct perf_counter_hw_event;
  
  #include <linux/types.h>
  #include <linux/aio_abi.h>
diff --cc init/Kconfig
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sys.c
Simple merge
diff --cc kernel/sys_ni.c
Simple merge