Merge linux (4.12.13-1) import into refs/heads/workingbranch
authorBen Hutchings <ben@decadent.org.uk>
Tue, 19 Sep 2017 00:59:17 +0000 (01:59 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 19 Sep 2017 00:59:17 +0000 (01:59 +0100)

Trivial merge