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

diff --combined drivers/char/keyboard.c
index 24f2656000e831cb813d2e5397f6bc6577c82cd0,edd996f6fb8788d9615dba959a829a73c692029c..1b63acfc6c785ac441e632f83264c80713b0340a
--- 1/drivers/char/keyboard.c
--- 2/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@@ -39,6 -39,7 +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);
@@@ -672,7 -673,7 +673,7 @@@ static void k_dead2(struct vc_data *vc
   */
  static void k_dead(struct vc_data *vc, unsigned char value, char up_flag, struct pt_regs *regs)
  {
 -      static unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };
 +      static const unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };
        value = ret_diacr[value];
        k_deadunicode(vc, value, up_flag, regs);
  }
@@@ -709,8 -710,8 +710,8 @@@ static void k_cur(struct vc_data *vc, u
  
  static void k_pad(struct vc_data *vc, unsigned char value, char up_flag, struct pt_regs *regs)
  {
 -      static const char *pad_chars = "0123456789+-*/\015,.?()#";
 -      static const char *app_map = "pqrstuvwxylSRQMnnmPQS";
 +      static const char pad_chars[] = "0123456789+-*/\015,.?()#";
 +      static const char app_map[] = "pqrstuvwxylSRQMnnmPQS";
  
        if (up_flag)
                return;         /* no action, if this is a key release */
@@@ -1035,7 -1036,7 +1036,7 @@@ static void kbd_refresh_leds(struct inp
  #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
                        ((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001))
  
 -static unsigned short x86_keycodes[256] =
 +static const unsigned short x86_keycodes[256] =
        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
         32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,