iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.10-rc5' into next

Browse Source 
Sync up with mainline to bring up improvements in various subsystems.
This commit is contained in:
Dmitry Torokhov
2017-01-24 12:37:43 -08:00
parent cefb26d4b3 7a308bb301
commit 0cce284537
17709 changed files with 1338764 additions and 566873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/mouse/trackpoint.c
View File

@ -15,7 +15,7 @@
#include <linux/input.h>
#include <linux/libps2.h>
#include <linux/proc_fs.h>
#include <asm/uaccess.h>
#include <linux/uaccess.h>
#include "psmouse.h"
#include "trackpoint.h"