tree cd760a18bcfa6e59b8b63fc71e333ba394b1cd9c
parent ba04a57b4acd05a764471b2accd02000f6641881
parent c3d77fab51f40821de91a744e4b514e9e4e76a7c
author Jiri Kosina <jkosina@suse.cz> 1396371909 +0200
committer Jiri Kosina <jkosina@suse.cz> 1396371909 +0200

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