Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / net / mlx4 / en_selftest.c

diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/mlx4/en_selftest.c
index 9c91a92..191a8dc 100644 (file)
--- a/drivers/net/mlx4/en_selftest.c
+++ b/drivers/net/mlx4/en_selftest.c
@@ -149,7 +149,7 @@ void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf)
 
                netif_carrier_off(dev);
 retry_tx:
-               /* Wait untill all tx queues are empty.
+               /* Wait until all tx queues are empty.
                 * there should not be any additional incoming traffic
                 * since we turned the carrier off */
                msleep(200);