non-LVU: merge patch with fixed trailing whitespace

diff --cc gas/write.c
index 24e13d611c69862f5aee03b7da7bd2667531d3e9,24e13d611c69862f5aee03b7da7bd2667531d3e9..dd9e4af727b31a870c2df633e2936b4c9264de5b
--- 1/gas/write.c
--- 2/gas/write.c
+++ b/gas/write.c
@@@ -2453,7 -2453,7 +2453,7 @@@ relax_segment (struct frag *segment_fra
                              _("leb128 operand is an undefined symbol: %s"),
                              S_GET_NAME (fragP->fr_symbol));
              }
--          
++
          /* Initial guess is always 1; doing otherwise can result in
             stable solutions that are larger than the minimum.  */
          address += fragP->fr_offset = 1;