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
..
aggregator.nix	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
default.nix	Merge branch 'master' into staging	2016-08-19 15:28:58 +01:00
module-dir.patch	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00