[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r75832:498cbdbc76f4
Date: 2015-02-11 19:27 +0100
http://bitbucket.org/pypy/pypy/changeset/498cbdbc76f4/

Log:	merge heads

diff --git a/rpython/jit/backend/arm/instruction_builder.py b/rpython/jit/backend/arm/instruction_builder.py
--- a/rpython/jit/backend/arm/instruction_builder.py
+++ b/rpython/jit/backend/arm/instruction_builder.py
@@ -379,7 +379,6 @@
                 | Q << 6
                 | M << 5
                 | (dm & 0xf))
-        
         self.write32(instr)
     return f