Merge branch 'master' into atomics
authorRyan Newton <rrnewton@gmail.com>
Sat, 31 Aug 2013 19:28:02 +0000 (15:28 -0400)
committerRyan Newton <rrnewton@gmail.com>
Sat, 31 Aug 2013 19:28:02 +0000 (15:28 -0400)
1  2 
includes/stg/SMP.h
rts/Linker.c
rts/sm/GC.c

Simple merge
diff --cc rts/Linker.c
Simple merge
diff --cc rts/sm/GC.c
Simple merge