Merge linux (4.11.6-1) import into refs/heads/workingbranch
authorBen Hutchings <ben@decadent.org.uk>
Mon, 19 Jun 2017 23:25:45 +0000 (00:25 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 19 Jun 2017 23:25:45 +0000 (00:25 +0100)

Trivial merge