Merge linux-latest (63+rpi5) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 9 Jun 2016 19:28:42 +0000 (20:28 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 9 Jun 2016 19:28:42 +0000 (20:28 +0100)

Trivial merge