git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2fae6a8
e40d641
)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Tue, 18 Mar 2014 08:43:56 +0000
(09:43 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Tue, 18 Mar 2014 08:43:56 +0000
(09:43 +0100)
Conflicts:
drivers/gpu/drm/i915/Makefile
Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff