]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 20:30:40 +0000 (13:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 20:30:40 +0000 (13:30 -0700)
commita29d7e304a52365384dd5df0f20c7a4175309e90
treeaa9d8f843223b6acfd86513881fa7aac2a7b439b
parent44b5f5a97f85a0f9bcadfc66a5a920c84e1aaa1c
parente37c3c25158e90f78a2ad6185ec3a9ccff1e509d
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/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."