From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 13 Mar 2007 01:13:45 +0000 (-0700)
Subject: Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.21-rc4~41
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=8b9909ded6922c33c221b105b26917780cfa497d;p=powerpc.git

Merge branch 'merge' of /linux/kernel/git/paulus/powerpc

* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] sys_move_pages should be callable from an SPU
  [POWERPC] Wire up sys_epoll_pwait
  [POWERPC] Allocate syscall number for sys_getcpu
  [POWERPC] update cell_defconfig
  [POWERPC] ps3: always make sure were running on a PS3
  [POWERPC] Fix spu SLB invalidations
  [POWERPC] avoid SPU_ACTIVATE_NOWAKE optimization
  [POWERPC] spufs: fix possible memory corruption is spufs_mem_write
---

8b9909ded6922c33c221b105b26917780cfa497d