Merge remote-tracking branch 'public/master' into vulkan

author Jason Ekstrand <jason.ekstrand@intel.com>

Fri, 15 Apr 2016 00:14:28 +0000 (17:14 -0700)

committer Jason Ekstrand <jason.ekstrand@intel.com>

Fri, 15 Apr 2016 00:14:28 +0000 (17:14 -0700)
author Jason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 00:14:28 +0000 (17:14 -0700)
committer Jason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 00:14:28 +0000 (17:14 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/compiler/nir/nir.h
Simple merge
diff --cc src/compiler/nir/nir_intrinsics.h
Simple merge
diff --cc src/compiler/nir/nir_lower_io.c
Simple merge
author	Jason Ekstrand <jason.ekstrand@intel.com>
	Fri, 15 Apr 2016 00:14:28 +0000 (17:14 -0700)
committer	Jason Ekstrand <jason.ekstrand@intel.com>
	Fri, 15 Apr 2016 00:14:28 +0000 (17:14 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_intrinsics.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiler/nir/nir_lower_io.c	patch \|	diff1 \|	diff2 \|	blob \| history