git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0cecdd8
384703b
)
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
author
Dave Airlie
<airlied@redhat.com>
Tue, 20 Dec 2011 14:43:53 +0000
(14:43 +0000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 20 Dec 2011 14:43:53 +0000
(14:43 +0000)
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff