Merge version 2.30-21+rpi1 and 2.30-22 to produce 2.30-22+rpi1

diff --cc debian/changelog
index f15766928bb9e7ef2f25f91c3e684339506b3209,439c657ce4816a6ff4b6da25889353f5654c0d4a..bf3668050bb5da1fa2247ea5a619e9df913a6d95
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- binutils (2.30-21+rpi1) buster-staging; urgency=medium
++binutils (2.30-22+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Jun 2018 12:30:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Jun 2018 09:42:18 +0000
++
+ binutils (2.30-22) unstable; urgency=medium
+ 
+   * Update, taken from the 2.30 branch 20180622.
+     - x86 gas: Replace CET bit with IBT and SHSTK bits.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 22 Jun 2018 08:11:21 +0200
  
  binutils (2.30-21) unstable; urgency=medium