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)
commit53d48080e55bf0c99cb7ca9de5b15a084d7324b5
tree98f4e257a61eebb14933d37ddc16678da0a7069d
parent039a79eb418211573bada57ec3a1edf5a9d6071e
parented5bc470aab7097c30e5f881158112f7830472f3
Merge upstream to r134237 at Fri. 1st July 2011.

Conflicts:
lib/Target/ARM/ARMCodeEmitter.cpp
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Target/ARM/ARMCodeEmitter.cpp