]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 167225d 1d6fad3)
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)
commit4b757c8437c007c55d5e4c5c12ca25527e2c3ba2
tree5becdb0689960e2c8b9786a0a8d7c26ae5452957tree | snapshot
parent167225dfa9f5850c6b395b3b968792f030248102commit | diff
parent1d6fad343222d37fac325de6be044f2c7e3caef8commit | 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
Linux Kernel Source Tree.