From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jun 2008 01:10:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.26-rc7~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061;p=linux-2.6

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
---

952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061
diff --cc drivers/usb/core/quirks.c
index 3da1ab4b38,ec15f1dd1d..c070b34b66
--- a/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 },