tree f3bdb0042ef04287ba4f5e0ad4b0d4f5ca879147
parent e7f43ea69b5ef34a3c294c15e936a1dcf52ccc7e
parent 0f541a4da9ff2b344f02f6634a7276bd2d00a6c5
author Alon Zakai <alonzakai@gmail.com> 1446661906 -0800
committer Alon Zakai <alonzakai@gmail.com> 1446661906 -0800

Merge remote-tracking branch 'llvm/master' into to-llvm-trunk

Conflicts:
	include/clang/Basic/TargetCXXABI.h
	lib/AST/ASTContext.cpp
	lib/CodeGen/CodeGenModule.cpp
	lib/CodeGen/ItaniumCXXABI.cpp
	test/CodeGen/target-data.c
	test/CodeGenCXX/member-function-pointers.cpp