projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c746e20
3ff323f
)
Merge remote branch 'origin/master' of ../linux-2.6 into drm-next
author
Dave Airlie
<airlied@redhat.com>
Tue, 8 Sep 2009 04:49:32 +0000
(14:49 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 8 Sep 2009 04:49:32 +0000
(14:49 +1000)
This was a non-trivial merge with some patches sent to Linus
in drm-fixes.
Conflicts:
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv515.c
Trivial merge
projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / commitdiff