]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: f948d56 90d95ef)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 01:10:40 +0000 (18:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 01:10:40 +0000 (18:10 -0700)
commit952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061
tree5becdb0689960e2c8b9786a0a8d7c26ae5452957tree
parentf948d56435fc1f7506f08866302ecd6e60b533ddcommit | diff
parent90d95ef617a535a8832bdcb8dee07bf591e5dd82commit | diff
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
drivers/usb/core/quirks.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.