A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'v2.6.30-rc1' into perfcounters/core

Browse source 
Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2009-04-08 10:35:30 +02:00
commit 5ea472a77f
680 changed files with 66497 additions and 20571 deletions
Download patch file Download diff file Expand all files Collapse all files

10
init/Kconfig
View file

@ -208,6 +208,12 @@ config POSIX_MQUEUE
If unsure, say Y.
config POSIX_MQUEUE_SYSCTL
bool
depends on POSIX_MQUEUE
depends on SYSCTL
default y
config BSD_PROCESS_ACCT
bool "BSD Process Accounting"
help
@ -670,10 +676,10 @@ config UTS_NS
config IPC_NS
bool "IPC namespace"
depends on NAMESPACES && SYSVIPC
depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
help
In this namespace tasks work with IPC ids which correspond to
different IPC objects in different namespaces
different IPC objects in different namespaces.
config USER_NS
bool "User namespace (EXPERIMENTAL)"