Merge branch 'for-4.21/ish' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 Dec 2018 18:59:43 +0000 (19:59 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 Dec 2018 18:59:43 +0000 (19:59 +0100)

Trivial merge