Merge http://nfsclient.bkbits.net/linux-2.5

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5

drivers/char/Kconfig

@@ -6,7 +6,7 @@ menu "Character devices"
 
 config VT
 	bool "Virtual terminal" if EMBEDDED
-	requires INPUT=y
+	select INPUT
 	default y
 	---help---
 	  If you say Y here, you will get support for terminal devices with

drivers/isdn/hisax/sedlbauer_cs.c

@@ -647,7 +647,6 @@ static void __exit exit_sedlbauer_cs(void)
 
 	/* XXX: this really needs to move into generic code.. */
 	while (dev_list != NULL) {
-		del_timer(&dev_list->release);
 		if (dev_list->state & DEV_CONFIG)
 			sedlbauer_release(dev_list);
 		sedlbauer_detach(dev_list);

kernel/kallsyms.c

@@ -252,6 +252,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
 	iter = kmalloc(sizeof(*iter), GFP_KERNEL);
 	if (!iter)
 		return -ENOMEM;
+	reset_iter(iter);
 
 	ret = seq_open(file, &kallsyms_op);
 	if (ret == 0)