Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index c3a329204511..ec2800ff8d42 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -124,7 +124,7 @@ MODULE_LICENSE("GPL");
 #define TX_BUF_SIZE 8192
 #define DMA_BUF_SIZE (RX_BUF_SIZE + 16) /* 8k + 16 bytes for trailers */
 
-#define TX_TIMEOUT      10
+#define TX_TIMEOUT      (HZ/10)
 
 struct znet_private {
         int rx_dma, tx_dma;
@@ -652,7 +652,7 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id)
                                         dev->stats.tx_errors++;
 
                                 /* Transceiver may be stuck if cable
-                                 * was removed while emiting a
+                                 * was removed while emitting a
                                  * packet. Flip it off, then on to
                                  * reset it. This is very empirical,
                                  * but it seems to work. */