psudedomerge to tie in upstream history
authorRaspbian kernel package updater <root@raspbian.org>
Thu, 9 Mar 2017 17:49:20 +0000 (17:49 +0000)
committerRaspbian kernel package updater <root@raspbian.org>
Thu, 9 Mar 2017 17:49:20 +0000 (17:49 +0000)

Trivial merge