diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 18:13:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 18:13:45 -0700 |
| commit | 8b9909ded6922c33c221b105b26917780cfa497d (patch) | |
| tree | ed90419e17baf41974a6a46611ceb0db0f55692b /drivers/net/hydra.c | |
| parent | 44a5085162f3d3231b359784319a207032e09523 (diff) | |
| parent | 7b3c384db1ff0f336b59d5062617915e216eaec1 (diff) | |
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 'drivers/net/hydra.c')
0 files changed, 0 insertions, 0 deletions