OSDN Git Service

Merge branch 'upstream' into merge-20120305
authorStephen Hines <srhines@google.com>
Mon, 5 Mar 2012 22:40:54 +0000 (14:40 -0800)
committerStephen Hines <srhines@google.com>
Mon, 5 Mar 2012 22:40:54 +0000 (14:40 -0800)
commitc02a5c5e8d9c1fd2a20ad4aed40f328564e95b40
tree9a892d465bc8a229322b6c296c346250a95ecd6c
parent2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f
parentc3384c93c0e4c50da4ad093f08997507f9281c75
Merge branch 'upstream' into merge-20120305

Conflicts:
lib/Support/Atomic.cpp

Change-Id: I563b3bc2a82942ccbae5bed42e53b9149a8bf3a0
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Support/Atomic.cpp
lib/Support/Unix/PathV2.inc
lib/Target/ARM/ARMCodeEmitter.cpp
lib/Target/ARM/ARMRelocations.h
utils/TableGen/CodeEmitterGen.cpp