diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 13:00:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 13:00:21 -0800 |
| commit | 8639dad84e4fe83577006e8e2bd9da79c6c2c41e (patch) | |
| tree | d14feb296d595582a940d34d5aad57fa791500e7 /fs/proc/loadavg.c | |
| parent | 9297524f6a2885bfb4e2431d658cd1ffaefbda41 (diff) | |
| parent | 461cba2d294fe83297edf8a6556912812903dce1 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Save/restore HWS_PGA on suspend/resume
drm: move drm vblank initialization/cleanup to driver load/unload
drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
drm/i915: Always read pipestat in irq_handler
drm/i915: Subtract total pinned bytes from available aperture size
drm/i915: Avoid BUG_ONs on VT switch with a wedged chipset.
drm/i915: Remove IMR masking during interrupt handler, and restart it if needed.
drm/i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
Diffstat (limited to 'fs/proc/loadavg.c')
0 files changed, 0 insertions, 0 deletions