diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-11 22:42:51 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-11 22:42:51 -0400 |
| commit | c1d1979c99ca397241da4e3d7e0cb77f7ec28240 (patch) | |
| tree | 2a988aae1ae7c08891543e844171cbcb4281a5bb /.mailmap | |
| parent | fd3aa01f176cf12b1625f4f46ba01f3340bb57ed (diff) | |
| parent | 55e04c94b925b0790c2ae0a79f16e939e9bb2846 (diff) | |
Merge branch 'wip-gpu-rtas12' into wip-slave-threads
Conflicts:
include/litmus/unistd_32.h
include/litmus/unistd_64.h
litmus/litmus.c
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions