Merge version 5.1.20-1+rpi2 and 5.1.20-2 to produce 5.1.20-2+rpi1

diff --cc debian/changelog
index 3447acf7c07aa1d2f2911d497485aa5be2305ec5,eb52b843a1001e6e651488c05946536c584886ba..8646d37dbc9e6617043c5b2a0cb93c5da241c99b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,9 +1,22 @@@
- supermin (5.1.20-1+rpi2) bullseye-staging; urgency=medium
++supermin (5.1.20-2+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
++  * Build-depend on raspbian kernel rather than debian armmp kernel.
++
++  [changes brought forward from 5.1.20-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 03 Dec 2019 01:42:22 +0000]
 +  * Drop linux-image-rpi build-dependency, we currently don't have kernels
 +    in raspbian bullseye.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Dec 2019 01:42:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jan 2020 03:25:38 +0000
 +
- supermin (5.1.20-1+rpi1) buster-staging; urgency=medium
+ supermin (5.1.20-2) unstable; urgency=medium
  
-   [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
-   * Build-depend on raspbian kernel rather than debian armmp kernel.
+   * Add missing kernel build depends, recommends for 2 ports
+     architectures: ia64, riscv64
  
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 30 Jan 2019 23:48:06 +0000
+  -- Hilko Bengen <bengen@debian.org>  Mon, 13 Jan 2020 23:52:30 +0100
  
  supermin (5.1.20-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge