diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-07 22:52:41 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-07 22:52:41 -0500 |
| commit | 1bd049fa895f9c6743f38b52ce14775f5a31ea63 (patch) | |
| tree | cb9163ac1c20f7fbdbde42eaab8013d0c3734aed /drivers/char/agp/intel-agp.c | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| parent | b0a007dc27d8d3ff3db07b3ea997323d9330f770 (diff) | |
Merge branch 'drm-core-next' into drm-linus
Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'drivers/char/agp/intel-agp.c')
0 files changed, 0 insertions, 0 deletions