OSDN Git Service

Merge upstream to r133240 at Fri. 17th Jun 2011.
authorNowar Gu <nowar100@gmail.com>
Fri, 17 Jun 2011 06:29:24 +0000 (14:29 +0800)
committerNowar Gu <nowar100@gmail.com>
Mon, 20 Jun 2011 07:49:07 +0000 (15:49 +0800)
commit907af0f20f58f2ea26da7ea64e1f094cd6880db7
tree02007757de416c561df174d582205cebfa582801
parent1d4f9a57447faa0142a1d0301e5ce550cfe60c4f
parentec324e5ae44025c6bdb930b78198f30f807e355b
Merge upstream to r133240 at Fri. 17th Jun 2011.

Conflicts:
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Target/ARM/ARMCodeEmitter.cpp
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Support/Unix/Host.inc
lib/Target/ARM/ARMCodeEmitter.cpp