Merge commit 'v2.6.33-rc5' into next

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/joystick/xpad.c
Simple merge

diff --cc drivers/input/keyboard/adp5588-keys.c
Simple merge

diff --cc drivers/input/keyboard/atkbd.c
index 7c235013dba3e4d2d94f9b55968967b79355fbb0,7b4056292eaf9387b95fe80c147ad6c9a65920e5..326875be192ed63d77bc40aa0c79c1e0c782c1a3
--- 1/drivers/input/keyboard/atkbd.c
--- 2/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@@ -1165,10 -1169,10 +1175,11 @@@ static int atkbd_reconnect(struct seri
  {
        struct atkbd *atkbd = serio_get_drvdata(serio);
        struct serio_driver *drv = serio->drv;
+       int retval = -1;
  
        if (!atkbd || !drv) {
 -              printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
 +              dev_dbg(&serio->dev,
 +                      "reconnect request, but serio is disconnected, ignoring...\n");
                return -1;
        }
  

diff --cc drivers/input/keyboard/sh_keysc.c
Simple merge

diff --cc drivers/input/mouse/hgpk.c
Simple merge

diff --cc drivers/input/serio/serio.c
index ee69ec399e089ac55feafe8e2f9090001a986c1a,e0f30186d513d4633649beeb9a7f73e361c7d972..c3b626e9eae7c075cd7597779ddbef4becb731f6
--- 1/drivers/input/serio/serio.c
--- 2/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@@ -275,36 -284,32 +275,30 @@@ static void serio_handle_event(void
  
        mutex_lock(&serio_mutex);
  
-       /*
-        * Note that we handle only one event here to give swsusp
-        * a chance to freeze kseriod thread. Serio events should
-        * be pretty rare so we are not concerned about taking
-        * performance hit.
-        */
-       if ((event = serio_get_event())) {
+       while ((event = serio_get_event())) {
  
                switch (event->type) {
 -                      case SERIO_REGISTER_PORT:
 -                              serio_add_port(event->object);
 -                              break;
  
 -                      case SERIO_RECONNECT_PORT:
 -                              serio_reconnect_port(event->object);
 -                              break;
 +              case SERIO_REGISTER_PORT:
 +                      serio_add_port(event->object);
 +                      break;
  
 -                      case SERIO_RESCAN_PORT:
 -                              serio_disconnect_port(event->object);
 -                              serio_find_driver(event->object);
 -                              break;
 +              case SERIO_RECONNECT_PORT:
 +                      serio_reconnect_port(event->object);
 +                      break;
  
 -                      case SERIO_RECONNECT_CHAIN:
 -                              serio_reconnect_chain(event->object);
 -                              break;
 +              case SERIO_RESCAN_PORT:
 +                      serio_disconnect_port(event->object);
 +                      serio_find_driver(event->object);
 +                      break;
  
 -                      case SERIO_ATTACH_DRIVER:
 -                              serio_attach_driver(event->object);
 -                              break;
 +              case SERIO_RECONNECT_CHAIN:
 +                      serio_reconnect_chain(event->object);
 +                      break;
  
 -                      default:
 -                              break;
 +              case SERIO_ATTACH_DRIVER:
 +                      serio_attach_driver(event->object);
 +                      break;
                }
  
                serio_remove_duplicate_events(event);

diff --cc include/linux/serio.h
Simple merge