Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --combined include/asm-powerpc/unistd.h
index bd3c6b6,908acb4..9e2c9e1
--- 1/include/asm-powerpc/unistd.h
--- 2/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@@ -304,13 -304,30 +304,30 @@@
  #define __NR_splice           283
  #define __NR_tee              284
  #define __NR_vmsplice         285
+ #define __NR_openat           286
+ #define __NR_mkdirat          287
+ #define __NR_mknodat          288
+ #define __NR_fchownat         289
+ #define __NR_futimesat                290
+ #ifdef __powerpc64__
+ #define __NR_newfstatat               291
+ #else
+ #define __NR_fstatat64                291
+ #endif
+ #define __NR_unlinkat         292
+ #define __NR_renameat         293
+ #define __NR_linkat           294
+ #define __NR_symlinkat                295
+ #define __NR_readlinkat               296
+ #define __NR_fchmodat         297
+ #define __NR_faccessat                298
  
- #define __NR_syscalls         286
 +#ifdef __KERNEL__
 +
+ #define __NR_syscalls         299
  
 -#ifdef __KERNEL__
  #define __NR__exit __NR_exit
  #define NR_syscalls   __NR_syscalls
 -#endif
  
  #ifndef __ASSEMBLY__
  
@@@ -422,7 -439,9 +439,7 @@@ type name(type1 arg1, type2 arg2, type
        __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \
  }
  
 -#ifdef __KERNEL__
  
 -#include <linux/config.h>
  #include <linux/types.h>
  #include <linux/compiler.h>
  #include <linux/linkage.h>
@@@ -456,6 -475,7 +473,7 @@@
  #ifdef CONFIG_PPC64
  #define __ARCH_WANT_COMPAT_SYS_TIME
  #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+ #define __ARCH_WANT_SYS_NEWFSTATAT
  #endif
  
  /*
@@@ -477,8 -497,8 +495,8 @@@ extern int execve(const char *file, cha
  #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall")
  #endif
  
 -#endif                /* __KERNEL__ */
  
  #endif                /* __ASSEMBLY__ */
 +#endif                /* __KERNEL__ */
  
  #endif /* _ASM_PPC_UNISTD_H_ */