Merge branch 'master' into next

diff --cc Documentation/sysctl/kernel.txt
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/module.c
index ee7ab612dafa045aaba38459543c5de5b6bc7de5,e797812a4d95f164bb377447a62de3089c0ba182..cb3887e770e21b2ca9244bef84ae19b1e9f2d3e5
--- 1/kernel/module.c
--- 2/kernel/module.c
+++ b/kernel/module.c
@@@ -68,12 -68,10 +68,13 @@@
  
  /* List of modules, protected by module_mutex or preempt_disable
   * (delete uses stop_machine/add uses RCU list operations). */
- static DEFINE_MUTEX(module_mutex);
+ DEFINE_MUTEX(module_mutex);
+ EXPORT_SYMBOL_GPL(module_mutex);
  static LIST_HEAD(modules);
  
 +/* Block module loading/unloading? */
 +int modules_disabled = 0;
 +
  /* Waiting for a module to finish initializing? */
  static DECLARE_WAIT_QUEUE_HEAD(module_wq);
  

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc security/commoncap.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge