Merge branch 'drm-intel-fixes' into drm-intel-next (9035a97a) · Commits · github.com / riscvarchive / riscv-linux

Commit 9035a97a authored Feb 16, 2011 by

Chris Wilson

Merge branch 'drm-intel-fixes' into drm-intel-next

Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_irq.c

parents fe16d949 45285833

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment