Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 0 insertions, 15 deletions

diff --git a/drivers/char/scan_keyb.h b/drivers/char/scan_keyb.h
deleted file mode 100644
index b4b611290a00..000000000000
--- a/drivers/char/scan_keyb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __DRIVER_CHAR_SCAN_KEYB_H
-#define __DRIVER_CHAR_SCAN_KEYB_H
-/*
- *      $Id: scan_keyb.h,v 1.1 2000/06/10 21:45:30 yaegashi Exp $
- *      Copyright (C) 2000 YAEGASHI Takeshi
- *      Generic scan keyboard driver
- */
-
-int register_scan_keyboard(int (*scan)(unsigned char *buffer),
-                           const unsigned char *table,
-                           int length);
-
-void __init scan_kbd_init(void);
-
-#endif