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: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061;p=pandora-kernel.git

Merge branch 'for-linus' of git://git./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
Reading git-diff-tree failed