psudedomerge to tie in upstream history
authorRaspbian kernel package updater <root@raspbian.org>
Sat, 31 Mar 2018 14:44:10 +0000 (15:44 +0100)
committerRaspbian kernel package updater <root@raspbian.org>
Sat, 31 Mar 2018 14:44:10 +0000 (15:44 +0100)

Trivial merge