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

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

diff --cc include/asm-powerpc/unistd.h
index bd3c6b6cc50e27645f2d0b69a1ba6dfcf725b7c3,908acb44cb8a11919637ea95673fba336557290b..9e2c9e1c1239abc76e229d572075ea7fe1516cf5
--- 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__