Shea Levy 8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" ... Revert a revert of a merge that shouldn't have been in master but was intentionally in staging. Next time I'll do this right after the revert instead of so far down the line... This reverts commit 9adad8612b.		2016-08-24 07:35:30 -04:00
..
darwin	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -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-23 18:50:06 +01:00
windows	mingw: update 3.1.0 -> 4.0.6	2016-04-21 13:38:20 +02:00