Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Tue, 9 May 2017 17:31:38 +0000 (18:31 +0100)
committerpopcornmix <popcornmix@gmail.com>
Tue, 9 May 2017 17:31:38 +0000 (18:31 +0100)

Trivial merge