Daniel Vetter 967667fd6d drm/plane-helper: Fixup mismerge ... I somehow manage to screw up applying Laurent's patch in eca93e28c256: "drm: Check in setcrtc if the primary plane supports the fb pixel format". It was a conflict with commit 3461b30b3e Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Thu Mar 5 10:32:44 2015 +0100 drm/plane-helper: unexport drm_primary_helper_create_plane and I just didn't check that the solution from wiggle made sense. Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: laurent.pinchart@ideasonboard.com Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: laurent.pinchart@ideasonboard.com Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-03-11 16:43:40 +01:00
..
drm	drm/plane-helper: Fixup mismerge	2015-03-11 16:43:40 +01:00
host1x	gpu: host1x: Provide a proper struct bus_type	2015-01-27 10:09:14 +01:00
ipu-v3	gpu: ipu-v3: do not divide by zero if the pixel clock is too large	2015-02-23 17:18:59 +01:00
vga	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
Makefile	gpu: host1x: Provide a proper struct bus_type	2015-01-27 10:09:14 +01:00