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

Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus 

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-sony.c
	drivers/hid/i2c-hid/i2c-hid.c
parents ba04a57b c3d77fab
Expand all 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