Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Fri, 24 Feb 2017 13:42:15 +0000 (13:42 +0000)
committerpopcornmix <popcornmix@gmail.com>
Fri, 24 Feb 2017 13:42:15 +0000 (13:42 +0000)

Trivial merge