Skip to content
Commit 3a73a65e authored by Julien Cristau's avatar Julien Cristau
Browse files

Merge tag 'libdrm-2.4.5' into debian-unstable

Conflicts:
	linux-core/Kconfig
	linux-core/Makefile
	linux-core/Makefile.kernel
	linux-core/drm_compat.c
	linux-core/drm_compat.h
	linux-core/drm_fops.c
	shared-core/nouveau_drv.h
	shared-core/nouveau_fifo.c
	shared-core/nouveau_mem.c
	shared-core/nouveau_object.c
	shared-core/nouveau_reg.h
	shared-core/nouveau_state.c
	shared-core/nv04_instmem.c
	shared-core/nv40_graph.c
	shared-core/nv50_fifo.c
	shared-core/nv50_graph.c
	shared-core/nv50_grctx.h
	shared-core/nv50_instmem.c
parents f41c962d a773ce1d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment