Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Mon, 9 Jan 2006 18:03:44 +0000 (10:03 -0800)]
1  2 
arch/powerpc/Kconfig
include/asm-powerpc/dma-mapping.h
include/linux/syscalls.h
kernel/sys_ni.c

Simple merge
Simple merge
@@@ -511,7 -511,10 +511,12 @@@ asmlinkage long sys_ioprio_set(int whic
  asmlinkage long sys_ioprio_get(int which, int who);
  asmlinkage long sys_set_mempolicy(int mode, unsigned long __user *nmask,
                                        unsigned long maxnode);
 +asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
 +                      const unsigned long __user *from, const unsigned long __user *to);
  
+ asmlinkage long sys_spu_run(int fd, __u32 __user *unpc,
+                                __u32 __user *ustatus);
+ asmlinkage long sys_spu_create(const char __user *name,
+               unsigned int flags, mode_t mode);
  #endif
diff --cc kernel/sys_ni.c
Simple merge