Auto merge of #37857 - shepmaster:llvm-4.0-dinodes, r=michaelwoerister

author bors <bors@rust-lang.org>

Sun, 4 Dec 2016 02:30:23 +0000 (02:30 +0000)

committer bors <bors@rust-lang.org>

Sun, 4 Dec 2016 02:30:23 +0000 (02:30 +0000)
author bors <bors@rust-lang.org>
Sun, 4 Dec 2016 02:30:23 +0000 (02:30 +0000)
committer bors <bors@rust-lang.org>
Sun, 4 Dec 2016 02:30:23 +0000 (02:30 +0000)
diff --cc src/librustc_llvm/ffi.rs
Simple merge
diff --cc src/librustc_llvm/lib.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sun, 4 Dec 2016 02:30:23 +0000 (02:30 +0000)
committer	bors <bors@rust-lang.org>
	Sun, 4 Dec 2016 02:30:23 +0000 (02:30 +0000)
		1	2
src/librustc_llvm/ffi.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_llvm/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history