diff options
| author | Dave Airlie | 2009-03-29 01:22:18 +0100 |
|---|---|---|
| committer | Dave Airlie | 2009-03-29 01:22:18 +0100 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /drivers/gpu/drm/radeon/r300_cmdbuf.c | |
| parent | drm/radeon: fix logic in r600_page_table_init() to match ati_gart (diff) | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| download | kernel-qcow2-linux-90f959bcb386da2c71613dcefc6a285e054a539e.tar.gz kernel-qcow2-linux-90f959bcb386da2c71613dcefc6a285e054a539e.tar.xz kernel-qcow2-linux-90f959bcb386da2c71613dcefc6a285e054a539e.zip | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r300_cmdbuf.c')
0 files changed, 0 insertions, 0 deletions