Merge branch 'linus' into irq/threaded

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

1 files changed, 3 insertions, 7 deletions

diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 0f94381ca6d0..346057218edc 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -57,12 +57,6 @@
 #include "jfs_debug.h"
 
 /*
- * __mark_inode_dirty expects inodes to be hashed.  Since we don't want
- * special inodes in the fileset inode space, we make them appear hashed,
- * but do not put on any lists.
- */
-
-/*
  * imap locks
  */
 /* iag free list lock */
@@ -497,7 +491,9 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary)
         release_metapage(mp);
 
         /*
-         * that will look hashed, but won't be on any list; hlist_del()
+         * __mark_inode_dirty expects inodes to be hashed.  Since we don't
+         * want special inodes in the fileset inode space, we make them
+         * appear hashed, but do not put on any lists.  hlist_del()
          * will work fine and require no locking.
          */
         ip->i_hash.pprev = &ip->i_hash.next;