git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22763c5
b0a007d
)
Merge branch 'drm-core-next' into drm-linus
author
Dave Airlie
<airlied@redhat.com>
Tue, 8 Dec 2009 03:52:41 +0000
(13:52 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 8 Dec 2009 03:52:41 +0000
(13:52 +1000)
Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff