bbs.cooldavid.org Git - net-next-2.6.git/commit

]> bbs.cooldavid.org Git - net-next-2.6.git/commit

git://bbs.cooldavid.org / net-next-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f899fc6 db8c076)

author	Chris Wilson <chris@chris-wilson.co.uk>
	Tue, 21 Sep 2010 10:19:32 +0000 (11:19 +0100)
committer	Chris Wilson <chris@chris-wilson.co.uk>
	Tue, 21 Sep 2010 10:19:32 +0000 (11:19 +0100)
commit	e9e5f8e8d373e72f5c39dafde1ce110fc7082118
tree	2991e33571a59cc2488daef36dcfeab7bddb9d7f	tree \| snapshot (tar.bz2 tar.gz zip)
parent	f899fc64cda8569d0529452aafc0da31c042df2e	commit \| diff
parent	db8c076b9206ea35b1f7299708d5510b17674db2	commit \| diff

Merge branch 'drm-intel-fixes' into HEAD

Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c

14 files changed:

drivers/char/agp/intel-agp.h	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/intel-gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_evict.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_suspend.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_crt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_tv.c	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree