diff options
| author | Rickard Green <[email protected]> | 2012-07-31 21:58:48 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-07-31 21:58:48 +0200 |
| commit | a67d0be885529844b3c14102604a38f556e70ecc (patch) | |
| tree | 0a5a01ca22d7d2d1c7ac904ba6abbcb8979d1296 /erts/emulator/beam/erl_mtrace.c | |
| parent | 75aa1216d65756e4a93098b481bbe0a468230b7a (diff) | |
| parent | 020f7cb45b6a3e5ff8af55cc58c7fd0fa0b447c7 (diff) | |
| download | otp-a67d0be885529844b3c14102604a38f556e70ecc.tar.gz otp-a67d0be885529844b3c14102604a38f556e70ecc.tar.bz2 otp-a67d0be885529844b3c14102604a38f556e70ecc.zip | |
Merge branch 'maint'
* maint:
Improve the enqueue operation of delayed dealloc
Implement delayed aux work wake up
Conflicts:
erts/emulator/beam/erl_alloc_util.c
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/emulator/beam/erl_mtrace.c')
0 files changed, 0 insertions, 0 deletions