git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22dd501
447aeb9
)
Merge remote branch 'origin/drm-core-next' into test
author
Dave Airlie
<airlied@redhat.com>
Mon, 7 Dec 2009 21:03:55 +0000
(07:03 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 7 Dec 2009 21:03:55 +0000
(07:03 +1000)
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Trivial merge