From: Linus Torvalds Date: Mon, 19 May 2008 20:30:40 +0000 (-0700) Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=860da5e578c25d1ab4528c0d1ad13f9969e3490f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'drm-patches' of git://git./linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: save and restore dsparb and d_state registers. drm/i915: fix off by one in VGA save/restore of AR & CR regs. drm: disable tasklets not IRQs when taking the drm lock spinlock Revert "drm/vbl rework: rework how the drm deals with vblank." --- 860da5e578c25d1ab4528c0d1ad13f9969e3490f