Merge version 2.30-22+rpi1 and 2.30.90.20180710-1 to produce 2.30.90.20180710-1+rpi1

diff --cc debian/changelog
index bf3668050bb5da1fa2247ea5a619e9df913a6d95,3c71a97b3c870459755a41c82c2e8b5471c2d011..6481c38b7576686194bb5dacc1fe49263244acaf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,52 @@@
- binutils (2.30-22+rpi1) buster-staging; urgency=medium
++binutils (2.30.90.20180710-1+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>  Wed, 27 Jun 2018 09:42:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 15 Jul 2018 21:27:13 +0000
++
+ binutils (2.30.90.20180710-1) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20180710).
+     - Fix PR ld/23388, configuration with --enable-separate-code on i386.
+       Closes: #903376.
+     - Fix PR ld/23372, Remove x86 ISA properties with empty bits.
+     - Fix PR binutils/23369, read/write flag for these registers on AArch64.
+     - Fix PR binutils/23242, SBO bit in disassembly mask for ldrah on AArch64.
+     - [GOLD] PowerPC .gnu.attributes support.
+     - CVE-2018-8945: PR binutils/22809, objdump segfault.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 10 Jul 2018 11:44:16 +0200
+ 
+ binutils (2.30.90.20180705-1) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20180705).
+     - Install the diagnostics.h header. Closes: #902765, #902823.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 05 Jul 2018 17:55:14 +0200
+ 
+ binutils (2.30.90.20180627-1) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20180627).
+     - CVE-2018-10372: PR binutils/23064, Fix illegal memory access when parsing
+       corrupt DWARF information.
+     - CVE-2018-10373: PR binutils/23065, nm segfault.
+     - CVE-2018-10534: PR binutils/23110, objcopy segfault.
+     - CVE-2018-10535: PR binutils/23113, objcopy segfault.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 27 Jun 2018 21:55:43 +0200
+ 
+ binutils (2.30.52.20180613-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20180613).
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 13 Jun 2018 14:20:30 +0200
+ 
+ binutils (2.30.51.20180512-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20180512).
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 12 May 2018 11:45:10 -0400
  
  binutils (2.30-22) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge