Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

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

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 7cef5afe89d8..4badac2d11d1 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -342,10 +342,12 @@
 #define __NR_pipe2              317
 #define __NR_inotify_init1      318
 #define __NR_perf_counter_open  319
+#define __NR_preadv             320
+#define __NR_pwritev            321
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls           320
+#define __NR_syscalls           322
 
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls