From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 16 Dec 2009 17:09:51 +0000 (-0800)
Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=006a526edb0f5a67679309a867a1af22d94e1687;p=mesa.git

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	src/mesa/drivers/dri/unichrome/via_ioctl.c
	src/mesa/drivers/dri/unichrome/via_screen.c
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom.c
---

006a526edb0f5a67679309a867a1af22d94e1687