Skip to content
Commit 0d69a3c7 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents 73759518 99d24902 7e415762
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