Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/tools/build-managers/conan/default.nix		2018-03-13 23:04:18 +02:00
..
filesystems	nixos/zfs: fix typo in enableLegacyCrypto description	2018-02-08 10:24:47 +00:00
bcache.nix
cpu-freq.nix
encrypted-devices.nix
filesystems.nix
kbd.nix	nixos: keymap: Fix cross-compilation.	2018-02-28 15:01:32 -05:00
lvm.nix
network-interfaces-scripted.nix	Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt	2018-03-05 17:31:22 +00:00
network-interfaces-systemd.nix	nixos/networking-interfaces: rename IP addresses/routes options	2018-02-17 14:01:24 +01:00
network-interfaces.nix	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
powertop.nix
scsi-link-power-management.nix
swraid.nix
trackpoint.nix
tty-backgrounds-combine.sh