Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 490e34bbf27a..7f19fefd3d45 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -340,6 +340,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
                                 seq_printf(m, "\nWrites: %d Bytes: %lld",
                                         atomic_read(&tcon->num_writes),
                                         (long long)(tcon->bytes_written));
+                                seq_printf(m, "\nFlushes: %d",
+                                        atomic_read(&tcon->num_flushes));
                                 seq_printf(m, "\nLocks: %d HardLinks: %d "
                                               "Symlinks: %d",
                                         atomic_read(&tcon->num_locks),
@@ -402,7 +404,6 @@ cifs_proc_init(void)
         if (proc_fs_cifs == NULL)
                 return;
 
-        proc_fs_cifs->owner = THIS_MODULE;
         proc_create("DebugData", 0, proc_fs_cifs, &cifs_debug_data_proc_fops);
 
 #ifdef CONFIG_CIFS_STATS