Skip to content
Commit 9548028a authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

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

Conflicts:
	pkgs/os-specific/linux/cpupower/default.nix
parents c08e4b91 da82aff2
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