Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
filesystems	nixos: f2fs filesystem module support (close #2085)	2014-05-11 13:53:26 +02:00
cpu-freq.nix	cpufreq: Don't fail if the CPU doesn't support frequency setting	2014-04-28 19:13:04 +02:00
encrypted-devices.nix	nixos: add some missing '.' in option descriptions	2014-06-24 21:25:11 +02:00
filesystems.nix	When auto-formatting ext devices, use the -F flag to make it work with unpartioned disks	2014-05-09 16:49:03 +02:00
kbd.nix	Allow upstream systemd units to be extended	2014-04-17 18:52:31 +02:00
lvm.nix	Don't enable LVM2 in containers	2014-04-15 23:43:39 +02:00
network-interfaces.nix	network-interfaces: Add an option for specifying search to resolv.conf	2014-05-02 12:42:20 -05:00
scsi-link-power-management.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
swraid.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
trackpoint.nix	Added an option to configure sensitivity and speed of trackpoints.	2014-05-23 10:18:03 +02:00
tty-backgrounds-combine.sh	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00