| commit | 860da5e578c25d1ab4528c0d1ad13f9969e3490f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 19 13:30:40 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 19 13:30:40 2008 -0700 |
| tree | aa9d8f843223b6acfd86513881fa7aac2a7b439b | |
| parent | 1bf99477226963d84b182b3995e355d3091199be [diff] | |
| parent | e948e99400b28af152414f15f8c8023ff2430b79 [diff] |
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."