Merge branches 'for-5.1/upstream-fixes' and 'for-5.2/core' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 6 May 2019 13:55:18 +0000 (15:55 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 6 May 2019 13:55:18 +0000 (15:55 +0200)

Trivial merge