Merge branch 'for-4.19/upstream' into for-linus
authorJiri Kosina <[email protected]>
Mon, 20 Aug 2018 16:33:50 +0000 (18:33 +0200)
committerJiri Kosina <[email protected]>
Mon, 20 Aug 2018 16:33:50 +0000 (18:33 +0200)

Trivial merge