Skip to content
Commit 67b989a0 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next 

Conflicts:
	drivers/input/Makefile
parents 56a8bd6d 69479f8d
Hide whitespace changes
Inline Side-by-side
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