Merge branch 'linus' into irq/threaded

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

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 680d0e0ec932..8379e3bca26c 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -576,7 +576,7 @@ out:
         if (fdblks_delta) {
                 /*
                  * If we are putting blocks back here, m_resblks_avail is
-                 * already at it's max so this will put it in the free pool.
+                 * already at its max so this will put it in the free pool.
                  *
                  * If we need space, we'll either succeed in getting it
                  * from the free block count or we'll get an enospc. If