Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-06-26 01:31:38 -04:00
parent 3cbd5b32cb fcc18e83e1
commit 4854c7b27f
4455 changed files with 203021 additions and 132954 deletions
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -39,6 +39,7 @@
 #include <linux/vt_kern.h>
 #include <linux/sysrq.h>
 #include <linux/input.h>
+#include <linux/reboot.h>

 static void kbd_disconnect(struct input_handle *handle);
 extern void ctrl_alt_del(void);