diff --git a/[refs] b/[refs] index 7f586d6dee17..4eb2164502d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04a5602db4a07ef3cad3eff5c757384096ab8758 +refs/heads/master: 1aa76df4f26bf02be1dde8ee3c3d16c4c5433a26 diff --git a/trunk/drivers/staging/mei/interrupt.c b/trunk/drivers/staging/mei/interrupt.c index 3544fee34e48..e85a85a96036 100644 --- a/trunk/drivers/staging/mei/interrupt.c +++ b/trunk/drivers/staging/mei/interrupt.c @@ -1423,7 +1423,7 @@ void mei_timer(struct work_struct *work) if (dev->iamthif_stall_timer) { if (--dev->iamthif_stall_timer == 0) { - dev_dbg(&dev->pdev->dev, "reseting because of hang to amthi.\n"); + dev_dbg(&dev->pdev->dev, "resetting because of hang to amthi.\n"); mei_reset(dev, 1); dev->iamthif_msg_buf_size = 0; dev->iamthif_msg_buf_index = 0;