Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Fri, 8 Sep 2017 12:30:17 +0000 (13:30 +0100)
committerpopcornmix <popcornmix@gmail.com>
Fri, 8 Sep 2017 12:30:17 +0000 (13:30 +0100)

Trivial merge