git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9a170ca
abb295f
)
Merge remote branch 'korg/drm-fixes' into drm-vmware-next
author
Dave Airlie
<airlied@redhat.com>
Wed, 6 Oct 2010 01:10:48 +0000
(11:10 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 6 Oct 2010 01:10:48 +0000
(11:10 +1000)
necessary for some of the vmware fixes to be pushed in.
Conflicts:
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/i915/intel_fb.c
include/drm/drmP.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff