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)
commit866d43c9ea88daa3751b58aba16a2a9b7f7aa067
tree063f29321d4ab3233a671dbb77b01d2f3773d372
parent1b464d8429983ed56ae070f038841abfcc60b85f
parent77f6ca5a6283a5d34c4bd9dc809fec9e37fdd80d
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: 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