diff --git a/[refs] b/[refs]
index 8a82cbc364e0..45500c429223 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc7cdf6c6bfc837501ea403a73eec78a350b1f7f
+refs/heads/master: 12806a241b1756518bf63c4a464fff73c1a363f2
diff --git a/trunk/drivers/atm/lanai.c b/trunk/drivers/atm/lanai.c
index f5569699f31c..68c758871812 100644
--- a/trunk/drivers/atm/lanai.c
+++ b/trunk/drivers/atm/lanai.c
@@ -1572,7 +1572,7 @@ static inline void host_vcc_unbind(struct lanai_dev *lanai,
 
 static void lanai_reset(struct lanai_dev *lanai)
 {
-	printk(KERN_CRIT DEV_LABEL "(itf %d): *NOT* reseting - not "
+	printk(KERN_CRIT DEV_LABEL "(itf %d): *NOT* resetting - not "
 	    "implemented\n", lanai->number);
 	/* TODO */
 	/* The following is just a hack until we write the real