Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 8bf765c4f58d..13f33b3081ec 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1050,8 +1050,8 @@ static void scan_object(struct kmemleak_object *object)
         unsigned long flags;
 
         /*
-         * Once the object->lock is aquired, the corresponding memory block
-         * cannot be freed (the same lock is aquired in delete_object).
+         * Once the object->lock is acquired, the corresponding memory block
+         * cannot be freed (the same lock is acquired in delete_object).
          */
         spin_lock_irqsave(&object->lock, flags);
         if (object->flags & OBJECT_NO_SCAN)