Merge branch 'next' into for-linus
James Morris [Thu, 11 Jun 2009 01:03:14 +0000 (11:03 +1000)]
1  2 
Documentation/kernel-parameters.txt
include/linux/mm.h
include/linux/sched.h
ipc/shm.c
kernel/sysctl.c

Simple merge
Simple merge
Simple merge
diff --cc ipc/shm.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge