Merge branch 't/auto-upd-grsec' into t/all
Merge branch 't/auto-upd-kernel' into t/all
Merge branch 't/grsec-module' into t/all
Merge branch 't/grsec-override' into t/all

Conflicts:
	pkgs/top-level/all-packages.nix
Merge branch 't/grsec-wip' into t/all
Merge branch 't/grsecurity' into t/all
Merge branch 't/inetutils' into t/all
Merge branch 't/knetwalk' into t/all
Merge branch 't/nixops-unstable' into t/all
Merge branch 't/vimrc' into t/all
Merge branch 't/virtmanager' into t/all
Merge branch 't/xfs' into t/all
Merge branch 't/zfs-import' into t/all