summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-10-20 21:15:14 -0400
committerBen Gamari <ben@smart-cactus.org>2019-10-20 21:15:14 -0400
commit8057ac965f72285a62cd57432c0a4f941a96a086 (patch)
tree4da6c11421590b759d610845ea91f4105f1c0a0f
parent4d674c4e58cf8748108712fa5f034e6363bfde1f (diff)
parentbfcafd39abc9d5f466f2fd284ebb5dbd45b42694 (diff)
parent921e4e360a1244ee63241efc62da28642343fece (diff)
downloadhaskell-8057ac965f72285a62cd57432c0a4f941a96a086.tar.gz
Merge branches 'wip/gc/sync-without-capability' and 'wip/gc/aligned-block-allocation' into wip/gc/preparationwip/gc/preparation