Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: appletouch - implement reset-resume logic
  Input: i8042 - retry failed CTR writes when resuming
  Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
  Input: pcspkr - remove negative dependency on snd-pcsp

Manually fixed up trivial conflict in drivers/usb/core/quirks.c

diff --cc drivers/usb/core/quirks.c
index 3da1ab4b389df9fc6f9b0e90fa5ed15eb5845902,ec15f1dd1d0bb384ae151249eb10bf93c1496670..c070b34b669de70da98c450eaf7ac4d48e85ec93
--- 1/drivers/usb/core/quirks.c
--- 2/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@@ -47,10 -47,9 +47,13 @@@ static const struct usb_device_id usb_q
        /* Edirol SD-20 */
        { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
  
+       /* appletouch */
+       { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
+ 
 +      /* Avision AV600U */
 +      { USB_DEVICE(0x0638, 0x0a13), .driver_info =
 +        USB_QUIRK_STRING_FETCH_255 },
 +
        /* M-Systems Flash Disk Pioneers */
        { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },