tree 063f29321d4ab3233a671dbb77b01d2f3773d372
parent 1b464d8429983ed56ae070f038841abfcc60b85f
parent 77f6ca5a6283a5d34c4bd9dc809fec9e37fdd80d
author Linus Torvalds <torvalds@linux-foundation.org> 1321982286 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1321982286 -0800

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