From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 12 Aug 2015 18:37:38 +0000 (-0500)
Subject: Merge topic 'ASTERISK-25315' into 13
X-Git-Tag: 13.6.0-rc1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d37488c7c32f029db46488e7f7687e7a9171fd5a;p=thirdparty%2Fasterisk.git

Merge topic 'ASTERISK-25315' into 13

* changes:
  chan_dahdi.c: Flush the DAHDI write buffer after starting DTMF.
  chan_dahdi.c: Lock private struct for ast_write().
---

d37488c7c32f029db46488e7f7687e7a9171fd5a