Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into v.4.17-next/soc-test
authorMatthias Brugger <matthias.bgg@gmail.com>
Mon, 14 May 2018 10:22:03 +0000 (12:22 +0200)
committerMatthias Brugger <matthias.bgg@gmail.com>
Mon, 14 May 2018 10:22:03 +0000 (12:22 +0200)

Trivial merge