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)
commit0afd32c6bb59e41b6692dec4473efaffffcad67b
treea8ac8cdccb1087a29e3d525c4ef1154b16f5f0ea
parent5b70cba4079fdf4e281d27c2db66c13d8969f687
parentf15cd6d99198e9c15229aefec639a34a6e8174c6
Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into v.4.17-next/soc-test