From: Linus Torvalds Date: Fri, 1 Jul 2011 23:38:59 +0000 (-0700) Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith... X-Git-Tag: v3.0-rc6~11 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c66a86d0cdce3bad2da794f114cc37377d242c3d Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/keithp/linux-2.6 * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: drm/i915: apply HWSTAM writes to Ivy Bridge as well drm/i915: move IRQ function table init to i915_irq.c drm/i915/overlay: Fix unpinning along init error paths drm/i915: Don't call describe_obj on NULL pointers drm/i915: Hold struct_mutex during i915_save_state/i915_restore_state --- c66a86d0cdce3bad2da794f114cc37377d242c3d