diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:43:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:43:55 -0800 |
| commit | b44a53d1dad6ba9ed87c8b3324133ec87fe5e588 (patch) | |
| tree | dd35d4c9b25be1fe8fa46ef8613fbbe52a410c41 /drivers/char | |
| parent | 214d93b02c4fe93638ad268613c9702a81ed9192 (diff) | |
| parent | 062ac622e03a8be5f894555ece540d63a54ae8bd (diff) | |
| download | talos-op-linux-b44a53d1dad6ba9ed87c8b3324133ec87fe5e588.tar.gz talos-op-linux-b44a53d1dad6ba9ed87c8b3324133ec87fe5e588.zip | |
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: index i shadowed in 2nd loop
drm/nv50-nvc0: prevent multiple vm/bar flushes occuring simultanenously
drm/nouveau: fix regression causing ttm to not be able to evict vram
drm/i915: Rebind the buffer if its alignment constraints changes with tiling
drm/i915: Disable GPU semaphores by default
drm/i915: Do not overflow the MMADDR write FIFO
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions
