OSDN Git Service

Merge upstream to r134237 at Fri. 1st July 2011.
authorNowar Gu <nowar100@gmail.com>
Fri, 1 Jul 2011 15:28:45 +0000 (23:28 +0800)
committerNowar Gu <nowar100@gmail.com>
Fri, 1 Jul 2011 15:37:27 +0000 (23:37 +0800)
Conflicts:
lib/Target/ARM/ARMCodeEmitter.cpp

1  2 
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Target/ARM/ARMCodeEmitter.cpp

Simple merge
Simple merge