diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:11:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:11:52 +0200 |
| commit | 38e50c9ba84ad755247220ce6a881fbdb44aaeec (patch) | |
| tree | 6a06f6d811781ca81f4cfcf56d71882fd4b041c1 /fs | |
| parent | d29ed11bb728bbe5175d1e9ff592140150305ab6 (diff) | |
| parent | 39bbf40227bcd37e02f7983b2d06696c10cec43a (diff) | |
| download | op-kernel-dev-38e50c9ba84ad755247220ce6a881fbdb44aaeec.zip op-kernel-dev-38e50c9ba84ad755247220ce6a881fbdb44aaeec.tar.gz | |
Merge branch 'for-4.14/multitouch' into for-linus
- support for media keys on Asus T304UA from João Paulo Rechi Vita
- support for Microsoft Win8 Wireless Radio Controls extensions
from João Paulo Rechi Vita
Conflicts:
drivers/hid/hid-ids.h
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
