diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:18:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:18:40 -0700 |
| commit | 70740d6c93030b339b4ad17fd58ee135dfc13913 (patch) | |
| tree | 2d423b34968aa111237c93490f62c3c8e962b5ef /include/asm-um | |
| parent | a3415dc34f4a615a904852e7a9d0cc2877007e9e (diff) | |
| parent | 7e78f72524b794fa8d73dc59aeeacc12a2e937fe (diff) | |
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
drm/i915: use pipes, not planes to label vblank data
drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
i915: Fix format string warnings on x86-64.
i915: Don't dereference HWS in /proc debug files when it isn't initialized.
i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
drm: Remove two leaks of vblank reference count in error paths.
drm: fix leak of cliprects in drm_rmdraw()
i915: Disable MSI on GM965 (errata says it doesn't work)
drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
i915: Protect vblank IRQ reg access with spinlock
Diffstat (limited to 'include/asm-um')
0 files changed, 0 insertions, 0 deletions