git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
575dc34
01dfba9
)
Merge intel drm-intel-next branch
author
Dave Airlie
<airlied@redhat.com>
Mon, 7 Sep 2009 10:27:20 +0000
(20:27 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 7 Sep 2009 10:27:20 +0000
(20:27 +1000)
Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff