Merge version 2.29.1-11+rpi1 and 2.29.1-12 to produce 2.29.1-12+rpi1

diff --cc debian/changelog
index 384357df1069300211969dbcd18f7a4dad750d47,148c1dd20c086162703ca7bf4cff246dbff9a75c..d00e0e400dd84050dc77b9dff5a0c316da1da39f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- binutils (2.29.1-11+rpi1) buster-staging; urgency=medium
++binutils (2.29.1-12+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>  Thu, 14 Dec 2017 01:48:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Dec 2017 12:03:16 +0000
++
+ binutils (2.29.1-12) unstable; urgency=medium
+ 
+   * Update, taken from the 2.29 branch 20171212.
+     - Fix PR binutils/21118, don't mask X_add_number containing
+       a register number.
+   * Revived from the tombs, build a binutils-ia64-linux-gnu package.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 13 Dec 2017 01:10:25 +0100
  
  binutils (2.29.1-11) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge