]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Revert "Revert "channel: Use frame deferral API for safe sleep."""
authorGeorge Joseph <gjoseph@digium.com>
Wed, 16 Nov 2016 23:45:05 +0000 (17:45 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 Nov 2016 23:45:05 +0000 (17:45 -0600)
1  2 
main/channel.c

diff --cc main/channel.c
Simple merge