]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Wed, 16 Mar 2011 01:34:41 +0000 (11:34 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Mar 2011 01:34:41 +0000 (11:34 +1000)
commit38f1cff0863809587b5fd10ecd0c24c8b543a48c
tree7cf6eb88cdc938c3683209d38311e711a1119400
parent4819d2e4310796c4e9eef674499af9b9caf36b5a
parent5359533801e3dd3abca5b7d3d985b0b33fd9fe8b
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next

This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.

Also fixes a trivial nouveau merge.

Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.c
20 files changed:
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/nouveau/nouveau_dma.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_mem.c
drivers/gpu/drm/nouveau/nouveau_notifier.c
drivers/gpu/drm/nouveau/nv50_instmem.c
drivers/gpu/drm/nouveau/nv50_vm.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/evergreen_blit_kms.c
drivers/gpu/drm/radeon/ni.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.c
drivers/gpu/drm/radeon/radeon_gem.c
drivers/gpu/drm/radeon/radeon_legacy_crtc.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/radeon/rv770.c