Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/libata-2.5

Makefile

 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -test9
+EXTRAVERSION = -test10
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"

drivers/net/sis190.c

@@ -949,7 +949,8 @@ SiS190_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 drop_tx:
 	tp->stats.tx_dropped++;
-	dev_kfree_skb(skb);
+	if (skb)
+		dev_kfree_skb(skb);
 	return 0;
 }