]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80d9b24 899e3ee)
Merge tag 'v3.1-rc10' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 18 Oct 2011 09:54:30 +0000 (10:54 +0100)
committerDave Airlie <airlied@redhat.com>
Tue, 18 Oct 2011 09:54:30 +0000 (10:54 +0100)
commit017ed8012e74ca15748863f45d2c078453026a0a
tree7071171a06de4e93fc890e0afce5c23596a26619tree | snapshot
parent80d9b24a658c83602aea66e45e2347c5bb3cbd47commit | diff
parent899e3ee404961a90b828ad527573aaaac39f0ab1commit | diff
Merge tag 'v3.1-rc10' into drm-core-next

There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
13 files changed:
drivers/gpu/drm/i915/i915_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_sdvo.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/evergreen.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/ni.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.h diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_asic.h diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_connectors.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/rv770.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_bo.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules