diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 09:18:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 09:18:06 -0800 |
| commit | 866d43c9ea88daa3751b58aba16a2a9b7f7aa067 (patch) | |
| tree | 063f29321d4ab3233a671dbb77b01d2f3773d372 /drivers/net | |
| parent | 1b464d8429983ed56ae070f038841abfcc60b85f (diff) | |
| parent | 77f6ca5a6283a5d34c4bd9dc809fec9e37fdd80d (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: 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
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions