Merge branch 'for-4.18/upstream-fixes_v2' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 25 Jun 2018 13:12:53 +0000 (15:12 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 25 Jun 2018 13:12:53 +0000 (15:12 +0200)

Trivial merge