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

This commit is contained in:
Jiri Kosina 2017-05-02 11:02:24 +02:00
commit 800f3eef8e
3 changed files with 876 additions and 814 deletions