Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: iforce - remove some pointless casts
  Input: psmouse - add support for Intellimouse 4.0
  Input: atkbd - fix HANGEUL/HANJA keys
  Input: fix misspelling of Hangeul key
  Input: via-pmu - add input device support
  Input: rearrange exports
  Input: fix formatting to better follow CodingStyle
  Input: reset name, phys and uniq when unregistering
  Input: return correct size when reading modalias attribute
  Input: change my e-mail address in MAINTAINERS file
  Input: fix potential overflows in driver/input/keyboard
  Input: fix potential overflows in driver/input/touchscreen
  Input: fix potential overflows in driver/input/joystick
  Input: fix potential overflows in driver/input/mouse
  Input: fix accuracy of fixp-arith.h
  Input: iforce - use ENOSPC instead of ENOMEM
  Input: constify drivers/char/keyboard.c

diff --combined MAINTAINERS
index 28c0a96,5e39368..31a1372
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1118,11 -1118,6 +1118,11 @@@ L:    lm-sensors@lm-sensors.or
  W:    http://www.lm-sensors.nu/
  S:    Maintained
  
 +HARDWARE RANDOM NUMBER GENERATOR CORE
 +P:    Michael Buesch
 +M:    mb@bu3sch.de
 +S:    Maintained
 +
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  P:    Robert Love
  M:    rlove@rlove.org
@@@ -1401,7 -1396,8 +1401,8 @@@ S:      Supporte
  
  INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
  P:    Dmitry Torokhov
- M:    dtor_core@ameritech.net
+ M:    dmitry.torokhov@gmail.com
+ M:    dtor@mail.ru
  L:    linux-input@atrey.karlin.mff.cuni.cz
  L:    linux-joystick@atrey.karlin.mff.cuni.cz
  T:    git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
@@@ -1441,11 -1437,6 +1442,11 @@@ P:    Tigran Aivazia
  M:    tigran@veritas.com
  S:    Maintained
  
 +INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 +P:    Deepak Saxena
 +M:    dsaxena@plexity.net
 +S:    Maintained
 +
  INTEL PRO/100 ETHERNET SUPPORT
  P:    John Ronciak
  M:    john.ronciak@intel.com
@@@ -2735,11 -2726,6 +2736,11 @@@ P:    Christoph Hellwi
  M:    hch@infradead.org
  S:    Maintained
  
 +TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 +P:    Deepak Saxena
 +M:    dsaxena@plexity.net
 +S:    Maintained
 +
  TI PARALLEL LINK CABLE DRIVER
  P:     Romain Lievin
  M:     roms@lpg.ticalc.org

diff --combined drivers/char/keyboard.c
index 13e3126,6cb85dc..4bb3d22
--- 1/drivers/char/keyboard.c
--- 2/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@@ -151,7 -151,6 +151,7 @@@ unsigned char kbd_sysrq_xlate[KEY_MAX 
          "230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000" /* 0x50 - 0x5f */
          "\r\000/";                                      /* 0x60 - 0x6f */
  static int sysrq_down;
 +static int sysrq_alt_use;
  #endif
  static int sysrq_alt;
  
@@@ -674,7 -673,7 +674,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);
  }
@@@ -711,8 -710,8 +711,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 */
@@@ -1037,7 -1036,7 +1037,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,
@@@ -1075,11 -1074,13 +1075,13 @@@ static int emulate_raw(struct vc_data *
                        put_queue(vc, 0x1d | up_flag);
                        put_queue(vc, 0x45 | up_flag);
                        return 0;
-               case KEY_HANGUEL:
-                       if (!up_flag) put_queue(vc, 0xf1);
+               case KEY_HANGEUL:
+                       if (!up_flag)
+                               put_queue(vc, 0xf2);
                        return 0;
                case KEY_HANJA:
-                       if (!up_flag) put_queue(vc, 0xf2);
+                       if (!up_flag)
+                               put_queue(vc, 0xf1);
                        return 0;
        }
  
@@@ -1144,7 -1145,7 +1146,7 @@@ static void kbd_keycode(unsigned int ke
        kbd = kbd_table + fg_console;
  
        if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)
 -              sysrq_alt = down;
 +              sysrq_alt = down ? keycode : 0;
  #ifdef CONFIG_SPARC
        if (keycode == KEY_STOP)
                sparc_l1_a_state = down;
@@@ -1164,14 -1165,9 +1166,14 @@@
  
  #ifdef CONFIG_MAGIC_SYSRQ            /* Handle the SysRq Hack */
        if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) {
 -              sysrq_down = down;
 +              if (!sysrq_down) {
 +                      sysrq_down = down;
 +                      sysrq_alt_use = sysrq_alt;
 +              }
                return;
        }
 +      if (sysrq_down && !down && keycode == sysrq_alt_use)
 +              sysrq_down = 0;
        if (sysrq_down && down && !rep) {
                handle_sysrq(kbd_sysrq_xlate[keycode], regs, tty);
                return;