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

Trivial merge