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

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 <mingo@elte.hu>

1 files changed, 8 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 35659ed442e5..b37350f16253 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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)"