Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/ieee802154/fakehard.c
	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/phy.c
	drivers/net/netxen/netxen_nic_init.c
	drivers/net/wireless/ath/ath9k/main.c

1 files changed, 1 insertions, 0 deletions

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 09f4e161799..448e5a0fcc2 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -1191,6 +1191,7 @@ static long rfkill_fop_ioctl(struct file *file, unsigned int cmd,
 #endif
 
 static const struct file_operations rfkill_fops = {
+        .owner          = THIS_MODULE,
         .open           = rfkill_fop_open,
         .read           = rfkill_fop_read,
         .write          = rfkill_fop_write,