From: Keith Packard <keithp@neko.keithp.com>
Date: Mon, 8 Jan 2007 06:37:40 +0000 (-0800)
Subject: Merge branch 'master' into crestline
X-Git-Tag: submit/1.0/20121108.012404~1146^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5aaf7648df82665851c9e67f5509b427ca34c8e;p=profile%2Fivi%2Flibdrm.git

Merge branch 'master' into crestline

Conflicts:

	shared-core/i915_drm.h

Whitespace change only
---

c5aaf7648df82665851c9e67f5509b427ca34c8e