diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-11 12:09:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-11 12:09:45 -0700 |
commit | 932088b136c3aeace052cc23179f54022ce3f723 (patch) | |
tree | 1ede657932301a6ace41c5a9fb01903f7bc69bf6 /drivers/video/aty/aty128fb.c | |
parent | f809e5a21f05b4aaeef0f9b191c01438d392fa5a (diff) | |
parent | dc529a4fe1ae4667c819437a94185e8581e1e680 (diff) | |
download | blackbird-op-linux-932088b136c3aeace052cc23179f54022ce3f723.tar.gz blackbird-op-linux-932088b136c3aeace052cc23179f54022ce3f723.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: fix 945 fence register writes for fence 8 and above.
drm/i915: Protect active fences on i915
drm/i915: Check to see if we've pinned all available fences
drm/i915: Check fence status on every pin.
drm/i915: First recheck for an empty fence register.
drm/i915: Fix bad \n in MTRR failure notice.
drm/i915: Don't restore palettes through VGA registers.
i915: add newline to i915_gem_object_pin failure msg
drm: Return EINVAL on duplicate objects in execbuffer object list
Diffstat (limited to 'drivers/video/aty/aty128fb.c')
0 files changed, 0 insertions, 0 deletions