Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 0 insertions, 1 deletions

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 49487b313f22..e7b3b273907d 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -476,7 +476,6 @@ int __init atm_proc_init(void)
                                      atm_proc_root, e->proc_fops);
                 if (!dirent)
                         goto err_out_remove;
-                dirent->owner = THIS_MODULE;
                 e->dirent = dirent;
         }
         ret = 0;