Merged revisions 84783 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 5 Oct 2007 16:49:16 +0000 (16:49 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 5 Oct 2007 16:49:16 +0000 (16:49 +0000)
commitfeb8f6f38bb127a80a5f1e4da8bb34fa4f1fe7c7
treea4b0c576cda4a01c1dfa739369245c66cb61c4f9
parent40e7d22cd72cb1ed5e48dc67ce6cda9c6b0480d6
Merged revisions 84783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84783 | russell | 2007-10-05 11:44:21 -0500 (Fri, 05 Oct 2007) | 4 lines

Do deadlock avoidance in a couple more places.  You can't lock two channels
at the same time without doing extra work to make sure it succeeds.
(closes issue #10895, patch by me)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84784 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_zap.c