Franz Pletz 41698c9efa Merge branch 'master' into hardened-stdenv		2016-02-15 20:05:29 +01:00
..
config	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-02-07 11:17:57 +00:00
hardware	facetimehd: blacklist bdc_pci when enabled	2016-02-04 11:31:28 +08:00
installer	Merge pull request #12742 from dezgeg/pr-uboot-changes	2016-02-15 16:10:37 +02:00
misc	nixos: update-locatedb - harden via systemd (#7220)	2016-01-23 20:44:30 +00:00
profiles	wpa_supplicant service: jobs -> systemd.services	2016-01-06 03:58:39 +00:00
programs	Revert "Merge #12357: nixos docs: show references to packages"	2016-02-03 12:16:33 +01:00
security	acme service: update plugins enum	2016-02-10 23:27:29 +00:00
services	Merge branch 'master' into hardened-stdenv	2016-02-15 20:05:29 +01:00
system	Revert "Remove double-backslashes from grub conf file".	2016-02-12 13:14:34 +01:00
tasks	Fix typo	2016-02-12 14:35:40 +01:00
testing	NixOS tests: Increase hung_task_timeout_secs	2016-01-04 16:53:42 +01:00
virtualisation	Add FIXME	2016-02-09 16:15:57 +01:00
module-list.nix	Merge branch 'master' into hardened-stdenv	2016-02-15 20:05:29 +01:00
rename.nix	nixos: Document "jobs" option removal	2016-01-14 13:08:56 +01:00