obadz 1047ed49d9 Merge branch 'master' into staging ... Conflicts: pkgs/os-specific/linux/kmod/default.nix cc @abbradar		2016-08-19 15:28:58 +01: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 branch 'master' into staging	2016-08-19 15:28:58 +01:00
windows	mingw: update 3.1.0 -> 4.0.6	2016-04-21 13:38:20 +02:00