diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 18:09:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 18:09:52 -0400 |
| commit | d98550e334715b2d9e45f8f0f4e1608720108640 (patch) | |
| tree | cd6a52960d479701cf6a29fd6535627481c5b27d /ipc/shm.c | |
| parent | f9cc8475e7595dbb41a9567f83288e2cd7445b6c (diff) | |
| parent | d205819e2346d20fee41297ea6cf789c591abccf (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: Use the ibm,pa-features property if available
powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses
[PATCH] ppc32 CPM_UART: fixes and improvements
[PATCH] ppc32 CPM_UART: Fixed break send on SCC
[PATCH] powerpc/kprobes: fix singlestep out-of-line
[PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions