diff options
| author | Dave Airlie <airlied@gmail.com> | 2011-01-26 17:12:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2011-01-26 17:12:42 +1000 |
| commit | 52bb4a7391321b9f32c0b6e032d0a5e1796f1968 (patch) | |
| tree | e8d51066bc584605b41054c1c55a457efbed6e06 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 6663050edd9c2e8b1e1f55c09459144d84c045f0 (diff) | |
| parent | 5d07929808a6430d3d844db4da828dfadbc49cd2 (diff) | |
| download | blackbird-op-linux-52bb4a7391321b9f32c0b6e032d0a5e1796f1968.tar.gz blackbird-op-linux-52bb4a7391321b9f32c0b6e032d0a5e1796f1968.zip | |
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/grctx: correct an off-by-one
drm/nv50: Fix race with PFIFO during PGRAPH context destruction.
drm/nouveau: Workaround incorrect DCB entry on a GeForce3 Ti 200.
drm/nvc0: implement irq handler for whatever's at 0x14xxxx
drm/nvc0: fix incorrect TPC register setup
drm/nouveau: probe for adt7473 before f75375
drm/nouveau: remove dead function definition
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
0 files changed, 0 insertions, 0 deletions
