Daniel Vetter af05559854 Merge airlied/drm-next into drm-misc-next ...

I need this to be able to apply the deferred fbdev setup patches, I
need the relevant prep work that landed through the drm-intel tree.

Also squash in conflict fixup from Laurent Pinchart.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2017-07-26 13:43:33 +02:00

..

Makefile

drm/mga: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:11 +02:00

mga_dma.c

drm/mga: remove device_is_agp callback

2017-01-26 10:45:03 +01:00

mga_drv.c

drm/pci: Deprecate drm_pci_init/exit completely

2017-06-20 10:41:03 +02:00

mga_drv.h

mga: switch compat ioctls to drm_ioctl_kernel()

2017-07-04 13:16:28 -04:00

mga_ioc32.c

Fix trivial misannotations

2017-07-06 02:00:00 -04:00

mga_irq.c

drm/irq: Use unsigned int pipe in public API

2015-10-06 12:57:47 +02:00

mga_state.c

mga: switch compat ioctls to drm_ioctl_kernel()

2017-07-04 13:16:28 -04:00

mga_warp.c

UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/

2012-10-02 18:01:07 +01:00