]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6dbe746 05269a3)
Merge branch 'drm-platform' into drm-testing
authorDave Airlie <airlied@redhat.com>
Wed, 7 Jul 2010 08:37:35 +0000 (18:37 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 7 Jul 2010 08:37:35 +0000 (18:37 +1000)
commitdb8cc27b804f89e8fd5f9d5385161956a777c471
tree4d84e12dbf9b4bd75fa6150f4aedf54a41d722dbtree
parent6dbe7465713f0e45f0e867105ca944978d57346ecommit | diff
parent05269a3a5a78bb074413de495105d7a2686c4529commit | diff
Merge branch 'drm-platform' into drm-testing

* drm-platform:
  drm: Make sure the DRM offset matches the CPU
  drm: Add __arm defines to DRM
  drm: Add support for platform devices to register as DRM devices
  drm: Remove drm_resource wrappers
16 files changed:
drivers/gpu/drm/drm_bufs.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_sysfs.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_dma.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_mem.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/evergreen.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/r100.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/r600.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_bios.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_device.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/rs600.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/rs690.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/rv770.c diff1 | diff2 | blob | history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror