Merge linux (4.9.6-3) import into refs/heads/workingbranch
authorBen Hutchings <ben@decadent.org.uk>
Sat, 28 Jan 2017 16:11:16 +0000 (16:11 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 28 Jan 2017 16:11:16 +0000 (16:11 +0000)

Trivial merge