Merge bk://kernel.bkbits.net/jmorris/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

net/ipv4/ah4.c

@@ -232,7 +232,7 @@ void ah4_err(struct sk_buff *skb, u32 info)
 	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
 	if (!x)
 		return;
-	printk(KERN_DEBUG "pmtu discvovery on SA AH/%08x/%08x\n",
+	printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n",
 	       ntohl(ah->spi), ntohl(iph->daddr));
 	xfrm_state_put(x);
 }

net/ipv4/esp4.c

@@ -425,7 +425,7 @@ void esp4_err(struct sk_buff *skb, u32 info)
 	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);
 	if (!x)
 		return;
-	printk(KERN_DEBUG "pmtu discvovery on SA ESP/%08x/%08x\n",
+	printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n",
 	       ntohl(esph->spi), ntohl(iph->daddr));
 	xfrm_state_put(x);
 }

net/ipv4/ipcomp.c

@@ -256,7 +256,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
 	                      spi, IPPROTO_COMP, AF_INET);
 	if (!x)
 		return;
-	printk(KERN_DEBUG "pmtu discvovery on SA IPCOMP/%08x/%u.%u.%u.%u\n",
+	printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%u.%u.%u.%u\n",
 	       spi, NIPQUAD(iph->daddr));
 	xfrm_state_put(x);
 }

net/ipv6/ah6.c

@@ -364,7 +364,7 @@ void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	if (!x)
 		return;
 
-	printk(KERN_DEBUG "pmtu discvovery on SA AH/%08x/"
+	printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/"
 			"%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
 	       ntohl(ah->spi), NIP6(iph->daddr));
 

net/ipv6/esp6.c

@@ -317,7 +317,7 @@ void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
 	if (!x)
 		return;
-	printk(KERN_DEBUG "pmtu discvovery on SA ESP/%08x/"
+	printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/"
 			"%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 
 			ntohl(esph->spi), NIP6(iph->daddr));
 	xfrm_state_put(x);

net/ipv6/ipcomp6.c

@@ -248,7 +248,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	if (!x)
 		return;
 
-	printk(KERN_DEBUG "pmtu discvovery on SA IPCOMP/%08x/"
+	printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/"
 			"%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
 			spi, NIP6(iph->daddr));
 	xfrm_state_put(x);