tree e6c64576e933ca81540aff02909e500a713b59d3
parent 4f94ff4e9c52b40250b8f5a54c9f99101de31e9d
parent 1694130910cd654a9215fbc0244975e3cf208fc1
parent 6e7edabfc6a8ac5dce8c55363a7bb1576fc9348f
author Jiri Kosina <jkosina@suse.cz> 1499677865 +0200
committer Jiri Kosina <jkosina@suse.cz> 1499677865 +0200

Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus

Conflicts:
	drivers/hid/hid-core.c