Merge branch 'for-4.15/sony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:09:44 +0000 (11:09 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:10:21 +0000 (11:10 +0100)
commitb50b9d3d21e0af1b8bda94d43c569593d45587af
treed3bec514c3d5831136dc95353f13ba0d9f8792bf
parentea3bbd0a2117d7291ae705caffbb99089315ec7b
parent492ca83c3d19fba1622164f07cd7b775596a7db2
Merge branch 'for-4.15/sony' into for-linus

- SHANWAN PS3 rumble fix from Bastien Nocera

Signed-off-by: Jiri Kosina <jkosina@suse.cz>