HomePhabricator

Merge branch 'master' of http://llvm.org/git/llvm into upstream-with-swift
Audit Required1a571b5cd5fa

Authored by friss on Nov 10 2015, 8:58 PM.

Description

Merge branch 'master' of http://llvm.org/git/llvm into upstream-with-swift

Conflicts:
include/llvm/IR/Attributes.h

apple-llvm-split-commit: da4ac44b606d54bb2ef58e10745d29c616aadb34
apple-llvm-split-dir: llvm/