git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86a930d 7f0801e)
Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 20 Mar 2015 10:43:59 +0000 (11:43 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 20 Mar 2015 10:44:34 +0000 (11:44 +0100)
Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Trivial merge
Pandora Kernel Repository