diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-20 23:55:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-20 23:55:49 -0500 |
| commit | 9a9284153d965a57edc7162a8e57c14c97f3a935 (patch) | |
| tree | 7e4c66810a98d2eff5953360fd79cd834fe935bd /fs/ocfs2 | |
| parent | ee61abb3223e28a1a14a8429c0319755d20d3e40 (diff) | |
| parent | 014b34409fb2015f63663b6cafdf557fdf289628 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"A bunch of intel and radeon fixes, along with two fixes to TTM code.
The correct fix for the Intel ironlake failure is in this, and should
make things more stable, along with some misc radeon fixes."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
ttm: on move memory failure don't leave a node dangling
ttm: don't destroy old mm_node on memcpy failure
Revert "drm/radeon: do not move bo to different placement at each cs"
drm/i915: fix FORCEWAKE posting reads
drm/i915: Invalidate the relocation presumed_offsets along the slow path
drm/i915/eDP: do not write power sequence registers for ghost eDP
drm/radeon: improve semaphore debugging on lockup
drm/radeon: allow FP16 color clear registers on r500
drm/radeon: clear reset flags if engines are idle
drm/i915: Record DERRMR, FORCEWAKE and RING_CTL in error-state
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions