Skip to content
Commit 89b5f6b6 authored by Julien Cristau's avatar Julien Cristau
Browse files

Merge tag '2.4.16' into debian-unstable 

Conflicts:
	include/drm/i810_drm.h
	xf86mm.h
parents e5a1be87 db50f512
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment