diff --git a/[refs] b/[refs]
index 8297d647791c..610dcf6b9ac0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6c340171f0daaccc95b90abbeed2b837157ee11
+refs/heads/master: 9e14f36bb577bd2828db5797303ca7bf6c87d50a
diff --git a/trunk/drivers/input/keyboard/omap-keypad.c b/trunk/drivers/input/keyboard/omap-keypad.c
index a0222db4dc86..b03c5b954864 100644
--- a/trunk/drivers/input/keyboard/omap-keypad.c
+++ b/trunk/drivers/input/keyboard/omap-keypad.c
@@ -214,7 +214,7 @@ static void omap_kp_tasklet(unsigned long data)
 	memcpy(keypad_state, new_state, sizeof(keypad_state));
 
 	if (key_down) {
-                int delay = HZ / 20;
+		int delay = HZ / 20;
 		/* some key is pressed - keep irq disabled and use timer
 		 * to poll the keypad */
 		if (spurious)
@@ -413,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
 	}
 	return 0;
 err5:
-	for (i = irq_idx - 1; i >=0; i--)
+	for (i = irq_idx - 1; i >= 0; i--)
 		free_irq(row_gpios[i], omap_kp);
 err4:
 	input_unregister_device(omap_kp->input);
@@ -421,10 +421,10 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
 err3:
 	device_remove_file(&pdev->dev, &dev_attr_enable);
 err2:
-	for (i = row_idx - 1; i >=0; i--)
+	for (i = row_idx - 1; i >= 0; i--)
 		gpio_free(row_gpios[i]);
 err1:
-	for (i = col_idx - 1; i >=0; i--)
+	for (i = col_idx - 1; i >= 0; i--)
 		gpio_free(col_gpios[i]);
 
 	kfree(omap_kp);