Merge branch 'linus' into irq/threaded

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

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index e73c332eb23f..e9df99574829 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -1883,7 +1883,7 @@ xfs_btree_lshift(
 
         /*
          * We add one entry to the left side and remove one for the right side.
-         * Accout for it here, the changes will be updated on disk and logged
+         * Account for it here, the changes will be updated on disk and logged
          * later.
          */
         lrecs++;
@@ -3535,7 +3535,7 @@ xfs_btree_delrec(
         XFS_BTREE_STATS_INC(cur, join);
 
         /*
-         * Fix up the the number of records and right block pointer in the
+         * Fix up the number of records and right block pointer in the
          * surviving block, and log it.
          */
         xfs_btree_set_numrecs(left, lrecs + rrecs);