From: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date: Mon, 4 Dec 2006 07:48:04 +0000 (+0800)
Subject: Merge branch 'master' into crestline
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=caf8010652f77e7687c0a3b7c267ba49d0a24d74;p=mesa.git

Merge branch 'master' into crestline

Conflicts:

	src/mesa/drivers/dri/i965/brw_tex_layout.c

Michel Dänzer replaced the copy of the 945 mipmap layout code with that from
the 945 driver directly.
---

caf8010652f77e7687c0a3b7c267ba49d0a24d74