Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-08-16 07:54:01 +00:00
..
darwin	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
gnu	Fix lots of fetchgit hashes (fallout from #15469)	2016-06-03 17:17:08 +03:00
linux	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-16 07:54:01 +00:00
windows