Eelco Dolstra dd3fe9d792 Merge remote-tracking branch 'origin/master' into systemd ... Conflicts: modules/services/system/nscd.nix		2012-10-08 13:47:37 -04:00
..
config	Merge remote-tracking branch 'origin/master' into systemd	2012-10-08 13:47:37 -04:00
hardware	Add new 'hardware.cpu.amd.updateMicrocode' option.	2012-09-11 18:44:37 +02:00
installer	ISO image: Fix graphical GRUB menu	2012-10-04 16:14:44 -04:00
misc	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
profiles	headless.nix: Mountall is gone	2012-10-04 23:25:33 -04:00
programs	Fix the dependencies of the vboxnet0 service	2012-08-20 16:19:57 -04:00
security	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-08-20 11:27:38 -04:00
services	Merge remote-tracking branch 'origin/master' into systemd	2012-10-08 13:47:37 -04:00
system	Remove ‘services.journald.logKernelMessages’	2012-10-08 10:51:17 -04:00
tasks	scsi-link-pm: Don't fail if there are no matching SCSI hosts	2012-10-04 23:25:11 -04:00
testing	Automatically append ".service" to the name of service units	2012-08-23 10:25:27 -04:00
virtualisation	fetch-ec2-data: Update for systemd	2012-10-04 23:26:19 -04:00
module-list.nix	Enable klogd on Linux < 3.5	2012-10-05 13:44:15 -04:00
rename.nix	Adding a rename line for rt73 -> ralink.	2012-08-11 14:54:43 +02:00