Skip to content
Commit 4c6c919a authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	pkgs/os-specific/linux/kernel/generic.nix
parents 335ae386 fc1224d5
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