Merge branch 'debian-unstable' into test

Conflicts:
	bsd-core/ati_pcigart.c
	bsd-core/drmP.h
	bsd-core/drm_agpsupport.c
	bsd-core/drm_atomic.h
	bsd-core/drm_auth.c
	bsd-core/drm_bufs.c
	bsd-core/drm_context.c
	bsd-core/drm_dma.c
	bsd-core/drm_drawable.c
	bsd-core/drm_drv.c
	bsd-core/drm_fops.c
	bsd-core/drm_ioctl.c
	bsd-core/drm_irq.c
	bsd-core/drm_linux_list.h
	bsd-core/drm_lock.c
	bsd-core/drm_memory.c
	bsd-core/drm_pci.c
	bsd-core/drm_scatter.c
	bsd-core/drm_sysctl.c
	bsd-core/drm_vm.c
	bsd-core/i915/Makefile
	bsd-core/i915_drv.c
	bsd-core/mach64_drv.c
	bsd-core/mga_drv.c
	bsd-core/r128_drv.c
	bsd-core/radeon_drv.c
	bsd-core/savage_drv.c
	bsd-core/sis_drv.c
	bsd-core/tdfx_drv.c
	bsd-core/via_drv.c
	linux-core/Makefile
	linux-core/Makefile.kernel
	linux-core/ati_pcigart.c
	linux-core/drmP.h
	linux-core/drm_agpsupport.c
	linux-core/drm_compat.c
	linux-core/drm_compat.h
	linux-core/drm_drv.c
	linux-core/drm_fops.c
	linux-core/drm_irq.c
	linux-core/drm_lock.c
	linux-core/drm_memory.c
	linux-core/drm_mm.c
	linux-core/drm_objects.h
	linux-core/drm_proc.c
	linux-core/drm_stub.c
	linux-core/drm_sysfs.c
	linux-core/drm_ttm.c
	linux-core/drm_vm.c
	linux-core/i915_drv.c
	linux-core/i915_fence.c
	linux-core/nouveau_sgdma.c
	linux-core/radeon_drv.c
	linux-core/xgi_cmdlist.c
	linux-core/xgi_drv.c
	linux-core/xgi_drv.h
	linux-core/xgi_fb.c
	linux-core/xgi_fence.c
	linux-core/xgi_misc.c
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
	shared-core/mach64_dma.c
	shared-core/nouveau_drv.h
	shared-core/nouveau_fifo.c
	shared-core/nouveau_mem.c
	shared-core/nouveau_notifier.c
	shared-core/nouveau_object.c
	shared-core/nouveau_state.c
	shared-core/nv04_fifo.c
	shared-core/nv20_graph.c
	shared-core/nv40_graph.c
	shared-core/nv50_fifo.c
	shared-core/nv50_graph.c
	shared-core/r300_cmdbuf.c
	shared-core/radeon_cp.c
	shared-core/radeon_drv.h
	shared-core/radeon_irq.c
	shared-core/radeon_mem.c
	shared-core/radeon_state.c