diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 18:56:34 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 18:56:34 +0100 |
commit | a0d5ef457393a240869d837cda1ccb22bbbe3dc2 (patch) | |
tree | 0d0fe184142b5efa810e9296952aab10b5c6e79c /block/bio.c | |
parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | Input: elan_i2c - add ELAN0605 to the ACPI table (diff) | |
download | linux-a0d5ef457393a240869d837cda1ccb22bbbe3dc2.tar.xz linux-a0d5ef457393a240869d837cda1ccb22bbbe3dc2.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov:
"Just a single change to Elan touchpad driver to recognize a new ACPI
ID"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - add ELAN0605 to the ACPI table
Diffstat (limited to 'block/bio.c')
0 files changed, 0 insertions, 0 deletions