git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a987fca
6c30c53
)
Merge Linus master to drm-next
author
Dave Airlie
<airlied@redhat.com>
Thu, 20 Aug 2009 03:38:04 +0000
(13:38 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 20 Aug 2009 03:38:04 +0000
(13:38 +1000)
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
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff