git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0eca52a
d4ac6a0
)
Merge branch 'drm-next' of ../drm-next into drm-linus
author
Dave Airlie
<airlied@redhat.com>
Thu, 8 Oct 2009 04:03:05 +0000
(14:03 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 8 Oct 2009 04:03:05 +0000
(14:03 +1000)
conflict in radeon since new init path merged with vga arb code.
Conflicts:
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/radeon_device.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff