Skip to content
Commit b50b9d3d authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.15/sony' into for-linus 



- SHANWAN PS3 rumble fix from Bastien Nocera

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents ea3bbd0a 492ca83c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment