git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9be23ae
009d043
)
Merge tag 'v3.18-rc7' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Tue, 2 Dec 2014 00:58:33 +0000
(10:58 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 2 Dec 2014 00:58:33 +0000
(10:58 +1000)
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff