Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6

into kernel.bkbits.net:/home/davem/net-2.6

Makefile

 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 3
-EXTRAVERSION =-rc4
+EXTRAVERSION =
 NAME=Feisty Dunnart
 
 # *DOCUMENTATION*

drivers/media/video/tuner.c

@@ -1041,6 +1041,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 
         i2c_attach_client(client);
 	if (type < TUNERS) {
+ 		t->type = type;
 		printk("tuner: type forced to %d (%s) [insmod]\n",
 		       t->type,tuners[t->type].name);
 		set_type(client,type);