Jan Tojnar e6c0c98940 Merge branch 'master' into staging-next ... zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.		2021-01-08 02:07:34 +01:00
..
0000-fix-SPDK-build-env.patch	ceph: 14.2.10 -> 15.2.4	2020-07-11 14:12:42 +02:00
ceph-glibc-2-32-sigdescr_np.patch	ceph: Fix build with glibc 2.32	2020-10-24 15:29:36 +02:00
default.nix	Merge branch 'master' into staging-next	2021-01-08 02:07:34 +01:00