summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-sony.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-01-14 18:11:06 +0300
committerJiri Kosina <jkosina@suse.cz>2016-01-14 18:11:06 +0300
commit83f1bfd6f57c422da70d1e296df1becc35c868be (patch)
tree064f94dd4e61c966edcc3dfcd95456700f4e59b9 /drivers/hid/hid-sony.c
parent76833559eb9d0c8f8e4481ec82216609a91956c7 (diff)
parent64bebefcf3195baed3d15dc377e15d1e7121036a (diff)
parent2cf83833fc9cff04c50e402260b724b3f001d737 (diff)
parent5d9374cf5f66ebe38007bccf0b4adc14f0013663 (diff)
parent6cf2e31bea1445ae50644d4d359786f43eb10afc (diff)
parent5f008c98598b80a64d7d8dc93b6c82af18783ac3 (diff)
parent73e7d63efb4d774883a338997943bfa59e127085 (diff)
parentb71b5578a84d297954e4812ba0ca2d466e61cf42 (diff)
parent7775fb929d959eade7c705e27a0a759997463da8 (diff)
parent0bbfe28ad0fdc11dddae5fe6f6e4e91b7be06395 (diff)
downloadlinux-83f1bfd6f57c422da70d1e296df1becc35c868be.tar.xz
Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container-of-cleanups', 'for-4.5/core', 'for-4.5/i2c-hid', 'for-4.5/logitech', 'for-4.5/multitouch', 'for-4.5/sony', 'for-4.5/upstream' and 'for-4.5/wacom' into for-linus