Merge branch 'rust-llvm-2014-05-20' of https://github.com/rust-lang/llvm

Conflicts:
	lib/Bitcode/Reader/BitcodeReader.h
	lib/IRReader/IRReader.cpp
	lib/Target/ARM/ARMFrameLowering.h
	lib/Target/ARM/ARMSubtarget.cpp
	lib/Transforms/IPO/PassManagerBuilder.cpp
	lib/Transforms/InstCombine/InstCombine.h
	lib/Transforms/InstCombine/InstCombineCompares.cpp
	tools/llvm-dis/llvm-dis.cpp