summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-07-10 11:11:05 +0200
committerJiri Kosina <jkosina@suse.cz>2017-07-10 11:11:05 +0200
commit604250ddcf874c4ee4137bf754f57fa903a3c1c1 (patch)
treee6c64576e933ca81540aff02909e500a713b59d3
parent4f94ff4e9c52b40250b8f5a54c9f99101de31e9d (diff)
parent1694130910cd654a9215fbc0244975e3cf208fc1 (diff)
parent6e7edabfc6a8ac5dce8c55363a7bb1576fc9348f (diff)
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus
Conflicts: drivers/hid/hid-core.c