git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2126d0a
6a2a11d
)
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
author
Dave Airlie
<airlied@redhat.com>
Mon, 18 Oct 2010 23:48:34 +0000
(09:48 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 18 Oct 2010 23:48:34 +0000
(09:48 +1000)
Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff