]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 17:18:06 +0000 (09:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 17:18:06 +0000 (09:18 -0800)
commit6d1db5b1875ca75de822e401e3e928591275dfad
tree063f29321d4ab3233a671dbb77b01d2f3773d372
parent3ed8a56395e56d288993ff75548e392152bbd0e4
parentc7e9e54c14fa4ec8e585fd7220264f9db3b48000
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: ams_delta_serio - include linux/module.h
  Input: elantech - adjust hw_version detection logic
  Input: i8042 - add HP Pavilion dv4s to 'notimeout' and 'nomux' blacklists