William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream ... This is a partial merge of staging for builds which are working		2015-11-13 15:53:10 -08:00
..
filesystems	Fix typo in nixos/modules/tasks/filesystems/nfs.nix.	2015-10-14 08:48:34 +08:00
bcache.nix
cpu-freq.nix
encrypted-devices.nix	encrypted-devices service: Fix keyed mount, clarify descriptions.	2015-09-22 09:49:28 +01:00
filesystems.nix	nixos/swap: refactor, add randomEncryption option	2015-10-20 15:56:12 +03:00
kbd.nix	i18n: add color scheme option (close #9626)	2015-11-09 14:53:59 +01:00
lvm.nix
network-interfaces-scripted.nix	networking module: vswitches: re-structure dependencies to systemd units	2015-10-06 20:12:39 +02:00
network-interfaces-systemd.nix	nixos networking: add vswitch option	2015-09-25 11:55:27 +02:00
network-interfaces.nix	Merge branch 'master.upstream' into staging.upstream	2015-10-15 10:22:28 -07:00
scsi-link-power-management.nix
swraid.nix
trackpoint.nix
tty-backgrounds-combine.sh