git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4819d2e
5359533
)
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
author
Dave Airlie
<airlied@redhat.com>
Wed, 16 Mar 2011 01:34:41 +0000
(11:34 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 16 Mar 2011 01:34:41 +0000
(11:34 +1000)
This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.
Also fixes a trivial nouveau merge.
Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff