summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-12 18:13:45 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-12 18:13:45 -0700
commit8b9909ded6922c33c221b105b26917780cfa497d (patch)
treeed90419e17baf41974a6a46611ceb0db0f55692b /include/asm-sparc
parent44a5085162f3d3231b359784319a207032e09523 (diff)
parent7b3c384db1ff0f336b59d5062617915e216eaec1 (diff)
downloadlinux-8b9909ded6922c33c221b105b26917780cfa497d.tar.bz2
Merge branch 'merge' of master.kernel.org:/pub/scm/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
Diffstat (limited to 'include/asm-sparc')
0 files changed, 0 insertions, 0 deletions