Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined net/rfkill/core.c
index ba2efb960c6007ecbd9b5b0a49372d21d32ed68a,7cb57ff6bafaa851383be535313ec738cf3fc44d..a001f7c1f71145b61eef6aaa7b6128a121751f6e
--- 1/net/rfkill/core.c
--- 2/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@@ -27,7 -27,6 +27,7 @@@
  #include <linux/list.h>
  #include <linux/mutex.h>
  #include <linux/rfkill.h>
 +#include <linux/sched.h>
  #include <linux/spinlock.h>
  #include <linux/miscdevice.h>
  #include <linux/wait.h>
@@@ -1189,6 -1188,7 +1189,7 @@@ static long rfkill_fop_ioctl(struct fil
  #endif
  
  static const struct file_operations rfkill_fops = {
+       .owner          = THIS_MODULE,
        .open           = rfkill_fop_open,
        .read           = rfkill_fop_read,
        .write          = rfkill_fop_write,