diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 05:03:47 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 05:03:47 +0100 |
| commit | 3ff99164f67aae78a2bd2313f65ad55bddb1ffea (patch) | |
| tree | d6bba03616d1be6ab9e6d9e92641a6f4047e1e15 /net/wimax | |
| parent | Merge branch 'drm-core-next' into drm-linus (diff) | |
| parent | drm/i915: Fix product names and #defines (diff) | |
| download | linux-3ff99164f67aae78a2bd2313f65ad55bddb1ffea.tar.xz linux-3ff99164f67aae78a2bd2313f65ad55bddb1ffea.zip | |
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 'net/wimax')
0 files changed, 0 insertions, 0 deletions