Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[powerpc.git] / net / dccp / timer.c

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 47b1616..aa34b57 100644 (file)
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -144,7 +144,7 @@ static void dccp_retransmit_timer(struct sock *sk)
        /*
         * sk->sk_send_head has to have one skb with
         * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP
-        * packet types (REQUEST, RESPONSE, the ACK in the 3way hanshake
+        * packet types (REQUEST, RESPONSE, the ACK in the 3way handshake
         * (PARTOPEN timer), etc).
         */
        BUG_TRAP(sk->sk_send_head != NULL);