nixpkgs/pkgs/os-specific/linux/cpupower
Tuomas Tynkkynen 9548028a22 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/os-specific/linux/cpupower/default.nix
2018-02-06 04:11:23 +02:00
..
default.nix