From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 26 Jul 2007 23:58:28 +0000 (-0700)
Subject: Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
X-Git-Tag: submit/1.0/20121108.012404~1030^2~119^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c561cb4650dc5895acfb3ae00c7ff455be31a860;p=profile%2Fivi%2Flibdrm.git

Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2

Conflicts:

	linux-core/drmP.h
	linux-core/drm_scatter.c
---

c561cb4650dc5895acfb3ae00c7ff455be31a860