diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 04:03:47 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 04:03:47 (GMT) |
| commit | 3ff99164f67aae78a2bd2313f65ad55bddb1ffea (patch) | |
| tree | d6bba03616d1be6ab9e6d9e92641a6f4047e1e15 /drivers/gpu/drm/radeon/r300.c | |
| parent | 1bd049fa895f9c6743f38b52ce14775f5a31ea63 (diff) | |
| parent | f2b115e69d46344ae7afcaad5823496d2a0d8650 (diff) | |
| download | linux-fsl-qoriq-3ff99164f67aae78a2bd2313f65ad55bddb1ffea.tar.xz | |
Merge remote branch 'anholt/drm-intel-next' into drm-linus
This merges the upstream Intel tree and fixes up numerous conflicts
due to patches merged into Linus tree later in -rc cycle.
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/drm_dp_i2c_helper.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_suspend.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
0 files changed, 0 insertions, 0 deletions