Merge branch 'for-4.12/sony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 2 May 2017 09:02:24 +0000 (11:02 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 2 May 2017 09:02:24 +0000 (11:02 +0200)
commit800f3eef8ebc1264e9c135bfa892c8ae41fa4792
treecb4aa7a8a0780283b02a7c511ff41ba345cd314f
parent18fc2163b8a410d4d36b8f44658580731c0afaa1
parent040fc001765d374776353cb4f8b03ea7fa41e3cd
Merge branch 'for-4.12/sony' into for-linus
drivers/hid/hid-sony.c