Merge bk://dtor.bkbits.net/input into suse.cz:/data/bk/input

diff --cc drivers/input/mouse/psmouse-base.c
index d427f304f7fc72ec0f6a544fcc400ada24518b95,5a1e141e8515bfb493fb2ded4930cd301d4aeb68..3d4a3006011cf91370d08b0b79ac29cc93dd1de2
--- 1/drivers/input/mouse/psmouse-base.c
--- 2/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@@ -650,9 -675,7 +675,9 @@@ static int psmouse_reconnect(struct ser
                return -1;
        }
  
-       psmouse->state = PSMOUSE_NEW_DEVICE;
 +      old_type = psmouse->type;
 +
+       psmouse->state = PSMOUSE_CMD_MODE;
        psmouse->type = psmouse->acking = psmouse->cmdcnt = psmouse->pktcnt = 0;
        if (psmouse->reconnect) {
               if (psmouse->reconnect(psmouse))