git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3e54f5b
6abff3c
)
Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next
author
Dave Airlie
<airlied@redhat.com>
Wed, 21 Dec 2011 09:50:56 +0000
(09:50 +0000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 21 Dec 2011 09:50:56 +0000
(09:50 +0000)
-next reported a messy merge, so I've merged my upstream pull into
my -next tree.
Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff