Skip to content
Commit 15439dd3 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'for-linus' into next 

Conflicts:

	drivers/input/mouse/appletouch.c
parents 39ab9dde 90d95ef6
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