git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
80d9b24
899e3ee
)
Merge tag 'v3.1-rc10' into drm-core-next
author
Dave Airlie
<airlied@redhat.com>
Tue, 18 Oct 2011 09:54:30 +0000
(10:54 +0100)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 18 Oct 2011 09:54:30 +0000
(10:54 +0100)
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff