diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-12 09:32:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-12 09:32:10 -0800 |
commit | 26b23ace8b54d836763bad3495fe8ed1a9d4354d (patch) | |
tree | 35bc17fd4235e32fb1ab2c37ca8156ea778329bd /drivers/ps3 | |
parent | 22a8cdd60339d931d0dca54427712b2714e5ba8b (diff) | |
parent | 75dfca80a610e4e87d3b9ccfb3f520692808697d (diff) | |
download | linux-26b23ace8b54d836763bad3495fe8ed1a9d4354d.tar.gz linux-26b23ace8b54d836763bad3495fe8ed1a9d4354d.tar.bz2 linux-26b23ace8b54d836763bad3495fe8ed1a9d4354d.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: hold ref on flip object until it completes
drm/i915: Fix crash while aborting hibernation
drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls.
drm/i915: fix pipe source image setting in flip command
drm/i915: fix flip done interrupt on Ironlake
drm/i915: untangle page flip completion
drm/i915: handle FBC and self-refresh better
drm/i915: Increase fb alignment to 64k
drm/i915: Update write_domains on active list after flush.
drm/i915: Rework DPLL calculation parameters for Ironlake
Diffstat (limited to 'drivers/ps3')
0 files changed, 0 insertions, 0 deletions