diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 18:04:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 18:04:31 (GMT) |
| commit | c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78 (patch) | |
| tree | 37df1d20532d61efbe2b4c33fb0ed376f08a3632 /net | |
| parent | d2865c7d4ef818421941579e185c1e4743692f85 (diff) | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
| download | linux-c6ff6486e5b306f76bf60b0dbfc63a6ed70d0a78.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov:
"A small fixup to i8042 adding Asus X450LCP to the nomux list"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - fix Asus X450LCP touchpad detection
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions