Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 7713a08bb10c..37bda5f3dde3 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -82,7 +82,7 @@ static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
         struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio);
 
-        /* XXX: I'm usure,  but it seems so */
+        /* XXX: I'm unsure, but it seems so */
         return ioread16(sdev->base + SCOOP_GPRR) & (1 << (offset + 1));
 }