projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a987fca 6c30c53)
Merge Linus master to drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 20 Aug 2009 03:38:04 +0000 (13:38 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 20 Aug 2009 03:38:04 +0000 (13:38 +1000)
commit51c8b4071d84d46cc100baa5931ad06b2a823c95
tree098cf9d41ce1c548d922708a770a9efe35e434dftree | snapshot
parenta987fcaa805fcb24ba885c2e29fd4fdb6816f08fcommit | diff
parent6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07fcommit | diff
Merge Linus master to drm-next

linux-next conflict reported needed resolution.

Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
13 files changed:
drivers/gpu/drm/drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_crtc_helper.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_edid.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_modes.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_dma.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_lvds.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_sdvo.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_ttm.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_bo.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_bo_util.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_tt.c diff1 | diff2 | blob | history
include/drm/ttm/ttm_bo_driver.h diff1 | diff2 | blob | history
include/drm/ttm/ttm_module.h diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git