Skip to content
GitLab
Commit 188933ac authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge tag 'v4.0-rc5' into next 

Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.

Conflicts:
	drivers/input/mouse/synaptics.c
parents 4ed0e032 bc465aa9
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment