Merge branch 'maint'

diff --cc isl_ast_codegen.c
index 368d25f,3eb964b..d124027
--- 1/isl_ast_codegen.c
--- 2/isl_ast_codegen.c
+++ b/isl_ast_codegen.c
@@@ -2284,8 -2286,11 +2286,11 @@@ static __isl_give isl_basic_set_list *d
   *
   * "sep_class" contains the user-specified split into separation classes
   * specialized to the current depth.
 - * "done" contains the union of th separation domains that have already
 + * "done" contains the union of the separation domains that have already
   * been handled.
+  * "atomic" contains the domain that has effectively been made atomic.
+  * This domain may be larger than the intersection of option[atomic]
+  * and the schedule domain.
   */
  struct isl_codegen_domains {
        isl_basic_set_list *list;

diff --cc isl_map.c
Simple merge

diff --cc isl_schedule.c
Simple merge

diff --cc isl_test.c
Simple merge