Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Tue, 8 Aug 2017 13:44:22 +0000 (14:44 +0100)
committerpopcornmix <popcornmix@gmail.com>
Tue, 8 Aug 2017 13:44:22 +0000 (14:44 +0100)

Trivial merge