diff --git a/[refs] b/[refs] index bb8054c6d28d..c33dabefd45e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c5cc8e0516005cb9a8f940276fac7614f7acf5c +refs/heads/master: 26aca5ec9e587562ac0f8c5b67d02567d7bf2ffe diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index 07599b492359..325fbc9612c9 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -789,7 +789,7 @@ spider_net_set_low_watermark(struct spider_net_card *card) * spider_net_release_tx_chain releases the tx descriptors that spider has * finished with (if non-brutal) or simply release tx descriptors (if brutal). * If some other context is calling this function, we return 1 so that we're - * scheduled again (if we were scheduled) and will not loose initiative. + * scheduled again (if we were scheduled) and will not lose initiative. */ static int spider_net_release_tx_chain(struct spider_net_card *card, int brutal)