diff options
| author | Jiri Kosina <[email protected]> | 2017-09-05 09:11:52 +0000 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2017-09-05 09:11:52 +0000 |
| commit | 38e50c9ba84ad755247220ce6a881fbdb44aaeec (patch) | |
| tree | 6a06f6d811781ca81f4cfcf56d71882fd4b041c1 /net/unix/af_unix.c | |
| parent | Merge branch 'for-4.14/ish' into for-linus (diff) | |
| parent | HID: multitouch: use proper symbolic constant for 0xff310076 application (diff) | |
| download | kernel-38e50c9ba84ad755247220ce6a881fbdb44aaeec.tar.gz kernel-38e50c9ba84ad755247220ce6a881fbdb44aaeec.zip | |
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 <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions