Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc include/asm-powerpc/dma-mapping.h
Simple merge

diff --cc include/linux/syscalls.h
index e910d1a481df6d37b6b4f12ee0f99657fe8c1db5,44fdd48d38e6ca75c5623020af113e837b3f9cc5..3eed47347013357c01f852222a07c5746fbdec5f
--- 1/include/linux/syscalls.h
--- 2/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -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