Merge branch 'for-4.12/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Jun 2017 08:52:46 +0000 (10:52 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Jun 2017 08:52:46 +0000 (10:52 +0200)

Trivial merge