From: Dave Airlie Date: Wed, 2 Feb 2011 01:22:34 +0000 (+1000) Subject: Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes X-Git-Tag: v2.6.38-rc4~17^2~15 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55205e229e4e16559cc2593fdfc37902b248879;hp=a55205e229e4e16559cc2593fdfc37902b248879;p=pandora-kernel.git Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes * 'intel/drm-intel-fixes' of /ssd/git/drm-next: drm/i915: Only bind to function 0 of the PCI device drm/i915: Suppress spurious vblank interrupts drm: Avoid leak of adjusted mode along quick set_mode paths drm: Simplify and defend later checks when disabling a crtc drm: Don't switch fb when disabling an output drm/i915: Reset crtc after resume drm/i915/crt: Force the initial probe after reset drm/i915: Reset state after a GPU reset or resume drm: Add an interface to reset the device drm/i915/sdvo: If at first we don't succeed in reading the response, wait ---