From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Tue, 12 Jan 2016 18:54:26 +0000 (-0800)
Subject: Merge ../mesa into vulkan
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af422fe9b36e98397d914be9eabae937634bef31;p=mesa.git

Merge ../mesa into vulkan

Merge master again to get the brw_device_info with the
correct slice counts for KBL.
---

af422fe9b36e98397d914be9eabae937634bef31