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

Browse source

Merge resume fixes from -fixes and an important fix for SDVO GMBUS.

...

This commit is contained in:

Chris Wilson 2011-02-01 08:49:07 +00:00

parent 72557b4f32 78c6e170ba

commit 4a1dc3ff68

10 changed files with 96 additions and 44 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

drivers/gpu/drm/drm_crtc.c

View file

21

drivers/gpu/drm/drm_crtc_helper.c

View file

7

drivers/gpu/drm/drm_irq.c

View file

2

drivers/gpu/drm/i915/i915_drv.c

View file

8

drivers/gpu/drm/i915/i915_irq.c

View file

10

drivers/gpu/drm/i915/intel_crt.c

View file

17

drivers/gpu/drm/i915/intel_display.c

View file

46

drivers/gpu/drm/i915/intel_sdvo.c

View file

2

include/drm/drmP.h

View file

7

include/drm/drm_crtc.h

View file