Skip to content
Commit 729e63f6 authored by Julien Cristau's avatar Julien Cristau
Browse files

Merge branch 'upstream-unstable' into debian-unstable 

Conflicts:
	linux-core/nouveau_backlight.c
	shared-core/nouveau_state.c
parents f7f9e2c2 f355ad89
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