From: Dave Airlie <airlied@linux.ie>
Date: Thu, 15 Nov 2007 04:04:19 +0000 (+1100)
Subject: Merge branch 'master' into modesetting-101
X-Git-Tag: submit/1.0/20121108.012404~642^2~352
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0fe478c1587780690edc465d957a762e02acc8a;p=profile%2Fivi%2Flibdrm.git

Merge branch 'master' into modesetting-101

Conflicts:

	shared-core/i915_dma.c
	tests/ttmtest/src/ttmtest.c
---

f0fe478c1587780690edc465d957a762e02acc8a