Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / drivers / block / drbd / drbd_receiver.c

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 20abef531c998721830b845927406de921b3adba..081522d3c7424046332d0eafc5baf76ece7acc8f 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1087,7 +1087,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
                        } else {
                                epoch->flags = 0;
                                atomic_set(&epoch->epoch_size, 0);
-                               /* atomic_set(&epoch->active, 0); is alrady zero */
+                               /* atomic_set(&epoch->active, 0); is already zero */
                                if (rv == FE_STILL_LIVE)
                                        rv = FE_RECYCLED;
                        }