OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
167ffc4
b37fa16
)
Merge tag 'v2.6.35-rc6' into drm-radeon-next
author
Dave Airlie
<airlied@redhat.com>
Mon, 2 Aug 2010 00:05:18 +0000
(10:05 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 2 Aug 2010 00:05:24 +0000
(10:05 +1000)
Need this to avoid conflicts with future radeon fixes
15 files changed:
1
2
drivers/gpu/drm/i915/i915_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/r100.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/r300.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/r520.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/r600.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/r600_cs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon_atombios.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon_combios.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon_device.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon_kms.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/rs400.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/rs600.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/rs690.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/rv515.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_gem.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/r100.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/r300.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/r520.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/r600.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/r600_cs.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon.h
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon_atombios.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon_combios.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon_device.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon_kms.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/rs400.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/rs600.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/rs690.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/rv515.c
Simple merge