Merge branch 'for-4.20/upstream-fixes' into for-next
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Mon, 12 Nov 2018 11:17:22 +0000 (12:17 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Mon, 12 Nov 2018 11:17:22 +0000 (12:17 +0100)

Trivial merge