Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h

diff --cc arch/powerpc/include/asm/systbl.h
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/powerpc/sysdev/mpic.c
Simple merge

diff --cc arch/x86/kernel/syscall_table_32.S
Simple merge

diff --cc arch/x86/mm/pat.c
Simple merge

diff --cc drivers/char/sysrq.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc include/linux/syscalls.h
index a1d177ce0a08edf101bc26e27416b6102cec43ef,16875f89e6a7135d28dfccb1c51e4f8174383bea..fc81937009f55746926ff45f29fb8ebbd6017ee8
--- 1/include/linux/syscalls.h
--- 2/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -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