Merge branch 'for-4.21/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 18 Dec 2018 09:23:24 +0000 (10:23 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 18 Dec 2018 09:23:24 +0000 (10:23 +0100)

Trivial merge