Merge branch 'for-4.18/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 8 Jun 2018 08:27:40 +0000 (10:27 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 8 Jun 2018 08:27:40 +0000 (10:27 +0200)

Trivial merge