Skip to content
Commit 6cf8c85f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-3.15/microsoft' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents ded75664 34e75dca
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